Re: [BUG] svn merge doesn't merge delete+add of folder

Quoting Jorge <jorge.uriarte@gmail.com>:

> Lieven Govaerts <lgo <at> mobsol.be> writes:
> > # now merge the new folder to trunk
> > cd ..
> > svn merge -r 2:4 file:///tmp/svnissue/issue/branch trunk
> >
>
>
> Did you try using "--ignore-ancestry"?
> It should help because your delete+add has really broken the historic-line of
> the folder (the newly added is really another folder)
[..]

Using --ignore-ancestry is another workaround indeed. The only problem with that
option is that it applies to all changes being merged, and it 'throws away' the
history of the folder being deleted+added in branch.

Lieven.

----------------------------------------------------------------
This message was sent using IMP, the Internet Messaging Program.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Mar 20 15:09:44 2006