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"

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

This message: [ Message body ]
Next message: Greg Ames: "[PATCH - v3] readable error messages on non-ASCII systems"
Previous message: Stefan Sperling: "2-URL merges incorrectly reverse-merge mergeinfo for merge target?"
In reply to: Stefan Sperling: "2-URL merges incorrectly reverse-merge mergeinfo for merge target?"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]