[PATCH 0 of 2] pull: updated output messages for branches

Kevin Bullock kbullock+mercurial at ringworld.org
Tue Mar 29 11:36:21 CDT 2011


On Mar 28, 2011, at 8:27 PM, Kevin Berridge wrote:

> When you pull in new heads which are NOT on the current branch but are on other branches the messages are somewhat confusing.  The first patch here removes the confusing suggestion to merge.  The second patch adds a slightly modified message for the current branch has multiple heads and there are other branches.
> 
> These patches include updates from conversations on the mailing list.

It would probably be helpful to add the matrix we came up with in a comment on the update() method, filled in with what the actual hints will now be.

pacem in terris / mir / shanti / salaam / heiwa
Kevin R. Bullock



More information about the Mercurial-devel mailing list