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

Merge a <file move backwards> does not fully work when a file is <in the way>

From: Greg D. Chernis <Greg.Chernis_at_iongeo.com>
Date: Sun, 27 Apr 2008 19:39:31 -0500

To Whom It May Concern:

Please review the following. Some may consider it "by design." I feel
this behavior is a bug.

To reproduce:
1) Move a file apples.cpp from subdirectory X\A\B to its parent
directory X\A, all in the local working copy X, and commit the change.
Notice two SVN operations taking place when moving.
2) Create a local file with the same name apples.cpp in the subdirectory
2) Use tSVN merge option to merge out the change in step 1.
3) Observe the merge skipping addition of the file X\A\B\ apples.cpp; it
only deletes X\A\apples.cpp. I would expect an "In the way" message,
since re-adding the file is part of the undo process.
4) When trying to commit the working copy, only one action - deletion of
the file X\A\apples.cpp - is taking place. We have effectively lost the
file apples.cpp on the server when rolling back the move operation with
Tortoise SVN operation of merging backwards.

Seen in tSVN 1.4.8.

Gregory Chernis <mailto:GChernis_at_iongeo.com>
ION FireFly Central System Software
Telephone (work) 281.879.3572 (cell) 832.661.9985

One cannot conceive the many without the one.
                Plato <http://en.wikipedia.org/wiki/Plato>

This email and any files transmitted with it are confidential and are intended solely for the use of the individual or entity to whom they are addressed. If you are not the original recipient or the person responsible for delivering the email to the intended recipient, be advised that you have received this email in error, and that any use, dissemination, forwarding, printing, or copying of this email is strictly prohibited. If you received this email in error, please immediately notify the sender and delete the original.
Received on 2008-04-28 07:07:21 CEST

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