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
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
thanks & cu,
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
Committed revision 9.
kahless_at_localhost /tmp/testch $ svn co file:///tmp/testrep/branches/branch2
Checked out revision 9.
adding a file in the trunk:
kahless@localhost /tmp/testch/trunk/dir2 $ svn add file2.3.txt
kahless@localhost /tmp/testch/trunk/dir2 $ svn commit -m ""
Transmitting file data .
Committed revision 10.
deleting the directory in the branch:
kahless@localhost /tmp/testch/branch2 $ svn rm dir2
kahless@localhost /tmp/testch/branch2 $ svn commit -m ""
Committed revision 11.
kahless@localhost /tmp/testch/trunk $ svn merge -r 9:11
kahless@localhost /tmp/testch/trunk $ ls dir2
kahless@localhost /tmp/testch/trunk $
kahless@localhost /tmp/testch/trunk $ svn update
At revision 11.
kahless@localhost /tmp/testch/trunk $ svn commit -m ""
Committed revision 12.
.. no error/conflict what so ever ..
To unsubscribe, e-mail: email@example.com
For additional commands, e-mail: firstname.lastname@example.org
Received on Mon May 14 00:31:02 2007