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

Re: svn merge on branches containing moved files/directories

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-03-18 04:05:28 CET

On Mar 17, 2005, at 7:17 AM, Scott Palmer wrote:
>> As described in the initial example: Both files in question, the
>> changed one and the added one, are deleted by svn, i.e. no longer
>> there. There are not just 'unversioned'. There are no files any more
>> which can be marked as '?' and taken care of later.
> he was mistaken?

I have no idea. Perhaps Volker was confused by what he saw. The 'svn
merge' command will "skip" over a locally-modified file, rather than
delete it. Try it yourself.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 18 04:07:58 2005

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.