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

Re: Merge of deleted file with a modified one

From: Ryan Schmidt <subversion-2006Q1_at_ryandesign.com>
Date: 2006-01-07 00:22:41 CET

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

> 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.

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

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.