We just got freaked out by the following sequence of events when doing a merge in cvs 1.10.8. 1. Text file revision 1.1 imported 2. Developer A checks out rev 1.1 3. Developer B checks out rev 1.1 4. A commits modifications 1.2 5. B updates and gets 1.2 6. B does cvs edit on 1.2 and makes changes. 7. A changes a block of code and checks in modification 1.3. 8. B does an update to get A's changes. What happens is that B gets a conflict report for one of A's changes. The resulting file looks like [stuff] [A's deleted code block from 1.2] <<<<<<< Filename ======= [A's added code block from 1.3] >>>>>>> 1.3 Is this correct behavior? We would have expected to see ONLY the 1.3 changes to merged in. I have reproduced this on both a Mac and a Linux box. Original files available on request. TIA, - rmgw http://www.electricfish.com/hawkfish/ ---------------------------------------------------------------------------- Richard Wesley Electric Fish, Inc. [EMAIL PROTECTED] "Before we begin our banquet, I would like to say a few words. And here they are: Nitwit! Blubber! Oddment! Tweak!" - "Harry Potter & Phil. Stone"
