Mercurial > hg
changeset 13803:e380964d53f8
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.
| author | Kevin Berridge <kevin.w.berridge@gmail.com> |
|---|---|
| date | Fri, 11 Mar 2011 20:43:12 -0500 |
| parents | 49b5a1aaf726 |
| children | 7dc2bd4c0dc8 |
| files | mercurial/commands.py tests/test-pull-branch.t |
| diffstat | 2 files changed, 31 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Wed Mar 30 09:49:45 2011 +0100 +++ b/mercurial/commands.py Fri Mar 11 20:43:12 2011 -0500 @@ -2989,7 +2989,10 @@ else: ui.status(_("not updating, since new heads added\n")) if modheads > 1: - ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) + if (len(repo.branchheads()) > 1): + ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) + else: + ui.status(_("(run 'hg heads' to see heads)\n")) else: ui.status(_("(run 'hg update' to get a working copy)\n"))
--- a/tests/test-pull-branch.t Wed Mar 30 09:49:45 2011 +0100 +++ b/tests/test-pull-branch.t Fri Mar 11 20:43:12 2011 -0500 @@ -134,3 +134,30 @@ not updating, since new heads added (run 'hg heads' to see heads, 'hg merge' to merge) +Make changes on new branch on tt + + $ hg branch branchC + marked working directory as branch branchC + $ echo b1 > bar + $ hg ci -Am "commit on branchC" + adding bar + +Make changes on default branch on t + + $ cd ../t + $ hg up -C default + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ echo a1 > bar + $ hg ci -Am "commit on default" + adding bar + +Pull branchC from tt + + $ hg pull ../tt + pulling from ../tt + searching for changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 1 changes to 1 files (+1 heads) + (run 'hg heads' to see heads)