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

deleting directory + merge = missing modifications ?

From: Herbert Poul <herbert.poul_at_gmail.com>
Date: 2007-05-14 00:30:44 CEST

Hi,
I've probably just missed something in the FAQ - but here is my problem:
i'm having a trunk and a branch .. and i'm creating a file in the
trunk within a directory which was created before creating the
branch.. this directory is then removed in the branch ..
and the branch is merged back into the trunk ..
this results in the deletion of the file i created in the trunk ..
without a conflict.. (i get the notice tough, that the file was
deleted.. )

so .. shouldn't this at least result in a conflict ? since there was a
modification which is simply lost .. ?

i've seen the problem when renaming a directory (svn copy/delete) -
and i have found a couple of issues related to it.. and announcements
that smart renaming would solve this issue.. but.. it also exists for
deleting directories.. so imho.. this should be a conflict (issue 2685
seems related)

thanks & cu,
 herbert

P.S.: i've verified the problem with version 1.3.2, but experienced it
also with 1.4

Here is my testcase:
creating/checkout of branch:

kahless@localhost /tmp/testch/trunk $ svn copy
file:///tmp/testrep/trunk file:///tmp/testrep/branches/branch2
Committed revision 9.
kahless_at_localhost /tmp/testch $ svn co file:///tmp/testrep/branches/branch2
A branch2/dir2
A branch2/dir2/file2.2.txt
A branch2/test1.txt
Checked out revision 9.

adding a file in the trunk:
kahless@localhost /tmp/testch/trunk/dir2 $ svn add file2.3.txt
A file2.3.txt
kahless@localhost /tmp/testch/trunk/dir2 $ svn commit -m ""
Adding dir2/file2.3.txt
Transmitting file data .
Committed revision 10.

deleting the directory in the branch:
kahless@localhost /tmp/testch/branch2 $ svn rm dir2
D dir2/file2.2.txt
D dir2
kahless@localhost /tmp/testch/branch2 $ svn commit -m ""
Deleting dir2

Committed revision 11.

the merge:
kahless@localhost /tmp/testch/trunk $ svn merge -r 9:11
file:///tmp/testrep/branches/branch2
D dir2/file2.2.txt
D dir2/file2.3.txt
D dir2
kahless@localhost /tmp/testch/trunk $ ls dir2
kahless@localhost /tmp/testch/trunk $

and commit:
kahless@localhost /tmp/testch/trunk $ svn update
At revision 11.
kahless@localhost /tmp/testch/trunk $ svn commit -m ""
Deleting dir2
Committed revision 12.

.. no error/conflict what so ever ..

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon May 14 00:31:02 2007

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