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

Re: 2-URL merges incorrectly reverse-merge mergeinfo for merge target?

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 19 May 2010 00:02:25 +0200

On Tue, May 18, 2010 at 11:57:21PM +0200, Stefan Sperling wrote:
> # Reintegrate the feature2 branch
> svn up $trunk
> svn merge --reintegrate $feature2_url $trunk
> svn ci $trunk -m "reintegrate bugfix from feature2 branch"

In case that "bugfix" comment confuses you, this should have read:

svn ci $trunk -m "reintegrate feature2 branch into trunk"

Received on 2010-05-19 00:02:56 CEST

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