[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Conflict-related code deletion
From: |
Chris Horn |
Subject: |
Conflict-related code deletion |
Date: |
Thu, 21 Nov 2002 13:02:52 -0500 |
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.
-----
chorn@rand.org
703.413.1100 x5100