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

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

From: Jorge <jorge.uriarte_at_gmail.com>
Date: 2006-03-20 14:43:35 CET

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)

Anyway... I think this option is under-documented; I find myself using it often
when promoting branches (not changes). The fact of TortoiseSVN not providing it
doesn't help neither; too much of my users are afraid of command line, I guess.

Regards,

_
Jorge

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Mar 20 14:52:08 2006

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