diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -766,7 +766,8 @@ def commit(ui, repo, *pats, **opts): ctx = repo[node] parents = ctx.parents() - if bheads and [x for x in parents if x.node() not in bheads]: + if bheads and [x for x in parents + if x.node() not in bheads and x.branch() == branch]: ui.status(_('created new head\n')) if not opts.get('close_branch'): diff --git a/tests/test-backout.out b/tests/test-backout.out --- a/tests/test-backout.out +++ b/tests/test-backout.out @@ -73,7 +73,6 @@ adding file1 marked working directory as branch branch2 adding file2 removing file1 -created new head changeset 3:d4e8f6db59fb backs out changeset 1:bf1602f437f3 the backout changeset is a new head - do not forget to merge (use "backout --merge" if you want to auto-merge) diff --git a/tests/test-branch-option.out b/tests/test-branch-option.out --- a/tests/test-branch-option.out +++ b/tests/test-branch-option.out @@ -13,7 +13,6 @@ 0 files updated, 0 files merged, 0 files marked working directory as branch b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved marked working directory as branch b -created new head in rev c branch a 1:dd6e60a716c6 2:f25d57ab0566 diff --git a/tests/test-command-template.out b/tests/test-command-template.out --- a/tests/test-command-template.out +++ b/tests/test-command-template.out @@ -1,4 +1,3 @@ -created new head 0 files updated, 0 files merged, 4 files removed, 0 files unresolved created new head # default style is like normal output diff --git a/tests/test-fetch.out b/tests/test-fetch.out --- a/tests/test-fetch.out +++ b/tests/test-fetch.out @@ -155,7 +155,6 @@ 1 files updated, 0 files merged, 0 files 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -created new head 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head @@ -183,7 +182,6 @@ marked working directory as branch secon adding b marked working directory as branch default adding c -created new head updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved % fetch should succeed diff --git a/tests/test-issue619.out b/tests/test-issue619.out --- a/tests/test-issue619.out +++ b/tests/test-issue619.out @@ -5,7 +5,6 @@ 0 files updated, 0 files merged, 1 files fast-forward 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -created new head bogus fast-forward should fail abort: can't merge with ancestor done diff --git a/tests/test-mq-safety.out b/tests/test-mq-safety.out --- a/tests/test-mq-safety.out +++ b/tests/test-mq-safety.out @@ -21,7 +21,6 @@ marked working directory as branch b adding c 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -created new head 0 files updated, 0 files merged, 1 files removed, 0 files unresolved changeset: 2:65309210bf4e branch: b diff --git a/tests/test-newbranch.out b/tests/test-newbranch.out --- a/tests/test-newbranch.out +++ b/tests/test-newbranch.out @@ -4,7 +4,6 @@ marked working directory as branch bar % branch shadowing abort: a branch of the same name already exists (use 'hg update' to switch to it) marked working directory as branch default -created new head % there should be only one default branch head changeset: 3:bf1bc2f45e83 tag: tip @@ -17,7 +16,6 @@ foo 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) foo -created new head changeset: 5:5f8fb06e083e branch: foo tag: tip @@ -113,7 +111,6 @@ 0 files updated, 0 files merged, 1 files 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) foo -created new head changeset: 6:f0c74f92a385 branch: foo tag: tip diff --git a/tests/test-push-warn.out b/tests/test-push-warn.out --- a/tests/test-push-warn.out +++ b/tests/test-push-warn.out @@ -169,7 +169,6 @@ marked working directory as branch b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -created new head pushing to j searching for changes abort: push creates new remote branches: b! @@ -266,10 +265,8 @@ updating to branch B 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved marked working directory as branch B -created new head 1 files updated, 0 files merged, 1 files removed, 0 files unresolved marked working directory as branch A -created new head %% glog of local @ 5: A b3 | diff --git a/tests/test-subrepo.out b/tests/test-subrepo.out --- a/tests/test-subrepo.out +++ b/tests/test-subrepo.out @@ -226,13 +226,11 @@ adding b 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -created new head 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding c 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -created new head 1 files updated, 0 files merged, 1 files removed, 0 files unresolved adding .hgsub committing subrepository s @@ -245,7 +243,6 @@ adding c 2 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -created new head 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding d