[PATCH 2 of 2] pull: new output message suggests better update action when a new branch head is added

[Greg Ward]

On 18 March 2011, Laurens Holst said:
> Op 16-03-11 23:55, Kevin Bullock schreef:
> >Here are my suggestions:
> >
> >0: keep as is
> >1: "run 'hg heads .' to see heads, 'hg merge' to merge" (per Greg's suggestion)
> >2: "new heads added on OTHERBRANCH" or just "new heads added on another branch"
> 
> Remember to cover the case when there are new heads on several branches:
> 
> if updated_branches.length == 1
>     'new heads added on OTHERBRANCH'
> else
>     'new heads added on other branches'

Actually, Mercurial carefully buries its head in the sand over
plurals.  That leads to funny-looking messages like

  added 1 changesets with 1 changes to 1 files

but it avoids logic like the above and avoids translation
difficulties.

So to be consistent, I guess we should just say

  new heads added on other branches

if >= 1 other branches were affected.

        Greg
-- 
Greg Ward                                http://www.gerg.ca/
God made machine language; all the rest is the work of man.