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

Re: Merge that Adds Dir Fails

From: Brian Buesker <bbuesker_at_qualcomm.com>
Date: 2005-02-22 18:52:27 CET

Ben Collins-Sussman wrote:

> On Feb 22, 2005, at 11:42 AM, Brian Buesker wrote:
>> The first thing I don't understand is why the merge is showing
>> dir1/dir2 and dir1 being deleted. If instead I do a merge just
>> consisting of dir2 (ie. svn merge $REPOSURL/tags/tag1/dir1/dir2
>> $REPOSURL/branches/branch1/dir1/dir2) from within dir2, the merge
>> succeeds and dir3 is added.
>> When I tried the same sequence of steps with the trunk version of
>> SVN, I don't get the "doesn't match existing URL" failure, although
>> it does show dir1/dir2 and dir1 being first deleted and then added
>> again. Is this expected behavior? It seems that it would be confusing
>> to users to see a directory that they know should not be deleted
>> actually being deleted and then added again (at least according to
>> the output of svn merge).
>> I think the problem has something to do with the way the branch and
>> tag were created (using mkdirs during an import). If instead they are
>> copied from the trunk, the merge works fine and I don't see anything
>> being deleted. Unfortunately we rely on using svn mkdir operations in
>> various steps of our SCM process. So it looks like the workaround for
>> now is to make sure the merge is done within the directory containing
>> the one being added.
> Have you tried the the --ignore-ancestry flag to 'svn merge'? Read
> about it here:
> http://svnbook.red-bean.com/en/1.1/ch04s03.html#svn-ch-4-sect-3.2.4

Thanks, I completely forgot about that option. Indeed the merge succeeds
when I use that. Thanks for the quick response.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 22 18:55:06 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.