That is odd... that's something that the ConflictChecker normally 
catches when I'm incorporating updates.

A-ha, looking in the BFAV I see that the original BreakpointSupport.cs 
file that it lists "[latest update: #5548]" in the header, which implies 
that it should have already been merged up to 5548, which it wasn't. 
(not an uncommon problem :-) ) So there wasn't much that the 
ConflictChecker could do after that, since it uses this header 
information to determine more recent conflicts.

- Doug

p.s. I'm going to start on incorporating a new batch of updates tonight.


goran.krampe at bluefish.se wrote:

>"Change Set:		FixImplIn-gk
>Date:			26 April 2004
>Author:			Gšran Krampe
>
>Someone somewhere (?) fumbled the ball when letting 5577 into the
>stream.
>The method Debugger>>contextStackMenu:shifted:
>first got modified by Ned (autocreation of stubs) in 5511 and then was
>run over in 5577 (breakpoints). I am not sure how this slipped by - I
>have been trying to see in BFAV if this was due to an approved item not
>yet pushed out in the stream, but I am not sure. Might be interesting to
>figure out how this happened.
>
>This cs puts that 'implement in' choice back in the menu. Simple as
>that."
>  
>
>------------------------------------------------------------------------
>
>
>  
>