facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

commit: fix complaint about branch merge creating new heads (issue2186)

Browse Source
This commit is contained in:
Matt Mackall 2010-05-15 21:24:23 -05:00
parent 47c45630d8
commit 73231aa117
10 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mercurial/commands.py
View File

@ -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'):

1
tests/test-backout.out
View File

@ -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)

1
tests/test-branch-option.out
View File

@ -13,7 +13,6 @@ updating to branch a
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

1
tests/test-command-template.out
View File

@ -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

2
tests/test-fetch.out
View File

@ -155,7 +155,6 @@ updating to branch default
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 second
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

1
tests/test-issue619.out
View File

@ -5,7 +5,6 @@ adding b
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

1
tests/test-mq-safety.out
View File

@ -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

3
tests/test-newbranch.out
View File

@ -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 @@ adding ff
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

3
tests/test-push-warn.out
View File

@ -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
|

3
tests/test-subrepo.out
View File

@ -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