"Sindbad the Seafarer" <sindbad.the.seafarer@gmx.net> writes:
> Now I only wonder what would have happened if wc1/file1 with the
> added paragraph had been already committed before
> wc2/renamedfile1? Would then the added paragraph in file1 had
> been merged into renamedfile1? (I simply have nothing around
> today to just try it.)
Well, the person doing the name would have a "copy" and "delete"
scheduled in the their working copy. When they try to commit, the
'delete' of file1 would fail, because their copy would be officially
out-of-date (it doesn't have the added paragraph).
So in response, the 2nd user runs 'svn up'. The receive a patch to
the schedule-delete file. At this point, they may have second
thoughts about committing. If they commit the "deletion and copy",
they'll be committing the deletion of the "new" file1 text, whereas
the copy will still be of the "old" file1. So yah, a commit would
result in the loss of the new paragraph.
Again, in an ideal situation, 'svn up' should add the paragraph not to
the schedule-delete file, but to the schedule-copy one. But that
won't happen until we have atomic move operations someday.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Sep 8 14:35:33 2003