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

Re: Problem with merging

From: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 14 Jan 2011 14:42:02 +0100

On Fri, Jan 14, 2011 at 02:12:56PM +0100, peter.schweizer_at_gmail.com wrote:
> Hi Folks,
>
> i want to merge a branch into trunk. For that i got the first revision
> of the branch with (svn log --stop-on-copy => 2854). Now i want to
> merge with "svn merge -r 2854:3143 ^/branches/mybranch ." in a trunk
> working dir.

You need to use the --reintegrate option to merge branches back to trunk.
See http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.reintegrate

Stefan
Received on 2011-01-14 14:42:43 CET

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.