[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Subversion 1.5

From: Alan Barrett <apb_at_cequrux.com>
Date: 2007-04-13 10:53:18 CEST

On Thu, 12 Apr 2007, lsuvkne@onemodel.org wrote:
> To duplicate data loss in a simple scenario involving two developers and
> a single branch:
> 1) Developer A edits a file and checks in.
> 2) Developer B renames the same file on the same branch, and tries to
> check in but gets an error that he is out of date.
> 3) Hmm, he thinks, I'd better run an 'svn update' on the directory, and
> does so, then reruns 'svn commit' without realizing that the update
> failed to apply the edits to the renamed file.
> 4) Result: 2 local copies of the file: one with the old name (which is not
> under version control but does have the edit from step #1), and one copy
> with the new filename, which was checked in but does not have the edit
> from step #1. Data is effectively lost.

OK. Step 2 is actually:

2a) copy old name to new name
2b) delete old name
2c) try to commit the changes from steps 2a and 2b.

I believe that step 3 above should report a conflict between trying to
delete the file (from step 2b) and trying to patch the file under the
old name (applying the change committed in step 1). I believe that
failure to report such a conflict is a bug, unrelated to the absence of
true rename functionality.

I have a vague idea that this bug was fixed recently on the trunk, but I
am not sure.

--apb (Alan Barrett)

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Apr 13 10:53:55 2007

This is an archived mail posted to the Subversion Users mailing list.