Geek Answers Handbook

Subversion combines the delete command

When I merge the trunk into function branches, the deletion that occurred on the trunk will not be replicated to my working copy.

Why doesn't deleting on the trunk delete the same file on the branch when merging? I am using subversion 1.5 client and server.

I assume that changes to the file in the branch will be skipped during the reintegration of the branch?

What is the best way to buy a file on the trunk, as a colleague deleted the file from the trunk just because it was not “ready”.

Situation:

cd project; svn copy trunk branches/f1; svn ci -m "branching out" branches f1; echo "modifying a file on branch." >> branches/f1/file1; svn ci branches/f1 -m "Branch modified"; echo "Above modify is not even needed to state the case"; svn rm trunk/file1; svn ci trunk -m "creating (conflicting) delete on trunk"; cd branches/f1; svn merge svn+ssh://repos/trunk . [ -f file1 ] && echo "file f1 does exist while it should have been deleted by merge.";

Thus, the file still exists in my working copy, although I go down to the torso where the file was actively deleted. Very unexpected. In my case, I didn’t even make any changes to the file, and this is the only reason I can think about why svn will save the file.

+6
merge svn
source share
2 answers

As far as I understand, you made a local conflict in file1. In your branch, it has been changed. It has been removed in your trunk. When you merge, it will be in conflict. Thus, the file will still be around.

I suggest 2 tests:

  • After executing the above code, svn status results are included.
  • Try to use the same code as above, but without changing this branch to everything. ( svn status would be helpful here as well.)
+1
source share

Are you sure the file deleted on the trunk is still under version control after merging? This may be unversified, but still present, which is the expected behavior. Looking at the output of svn status , you will see that the file is still under version control.

You can take a look at this bug report, which explains the situation in detail: http://subversion.tigris.org/issues/show_bug.cgi?id=2282

0
source share

More articles:


All Articles