Re: Merge of deleted file with a modified one

On Jan 7, 2006, at 00:03, Alexey Yudichev wrote:

[snip]
> I discovered that if I
> 1) create a branch from trunk via svn copy
> 2) delete a file in branch and commit
> 3) modify the same file in trunk and commit
> 4) merge branch to trunk
> I get the file deleted. Which means I lose my changes made in trunk.
[snip]

The file should not get deleted; rather, it should become unversioned
in your working copy. If that's not what happens, please provide a
transcript showing what you did.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jan 7 00:24:52 2006