Chris: I tried to reproduce your problem on my Linux CVS (1.11.1p1) and could not. At step 12, where you experienced a loss of work for Tom, my CVS update again correctly notified a conflict and marked it as such in the local copy of the file.
My setup was to use a local file system as the CVS root, and check out two copies of an example project. Maybe you can check out the Win2K CVS by itself on a local file system and see if its only a problem there. Also, see if you can reproduce the problem with only the CVS 1.11.1p1 client and server. Hope this helps. Pankaj > -----Original Message----- > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]On Behalf Of > Chris Horn > Sent: Thursday, November 21, 2002 10:03 AM > To: [EMAIL PROTECTED] > Subject: Conflict-related code deletion > > > I believe a rather simple fix would be to have CVS set > file.txt as reserved > when it detects a conflict and sends off the file to be fixed > by the person > who generated the conflict. > > I've added >> to indicate where the reserved checkout would fall. > > 1. Chris and Tom have revision 1.11 of file.txt > 2. Chris edits line 5 of file.txt and commits it to the server > 3. The server revision is now 1.12 > 4. Tom edits line 5 of file.txt and tries to commit to the server > 5. Tom receives an up-to-date check failed error (as he should) > 6. Tom updates file.txt and conflict text is filled in around line 5 > > >> Here, the CVS server would mark file.txt as reserved > >> This would make Tom the temporary sole owner of the file > > 7. Tom opens file.txt and resolves the conflict > 8. Chris changes line 5 of file.txt again, and commits it to > the server > > >> This would not be possible if the file were under a > reserved checkout > to Tom > > 9. The server revision is now 1.13 > 10. Tom tries to commit his conflict resolution (from step 7) > 11. Tom receives an up-to-date check failed error > 12. Tom updates his file, and loses his edit to line 5. > 13. Tom and Chris now have revision 1.13 > > > I look forward to hearing from someone. > > Thank you. > chris horn. > > ----- > [EMAIL PROTECTED] > 703.413.1100 x5100 > > > > _______________________________________________ > Bug-cvs mailing list > [EMAIL PROTECTED] > http://mail.gnu.org/mailman/listinfo/bug-cvs > --- Pankaj K Garg [EMAIL PROTECTED] 1684 Nightingale Avenue 408-373-4027 Sunnyvale, CA 94304 http://home.earthlink.net/~gargp _______________________________________________ Bug-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/bug-cvs
