[PATCH] pull: don't suggest running hg merge when new heads are on different branches

Matt Mackall mpm at selenic.com
Wed Mar 30 09:20:46 CDT 2011


On Mon, 2011-03-28 at 21:46 -0400, Kevin Berridge wrote:
> # HG changeset patch
> # User Kevin Berridge <kevin.w.berridge at gmail.com>
> # Date 1299894192 18000
> # Node ID 197c94d6f356e7cd07eb205bcfd9c0d44fd7ee6f
> # Parent  1bb2a56a9d73b386378564381807fdf8df38ea3f
> pull: don't suggest running hg merge when new heads are on different branches
> 
> After a pull when new heads are added but no head is added on the current
> branch, the "run 'hg merge'" message can be misleading.  This patch doesn't
> output the merge message in that scenario.

These are queued, please follow up with a patch that adds the behavior
table as a comment.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list