mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
e094244749
The heads(...) and branchheads(...) functions will now only return closed heads when explicitly asked for them. This will cause 'hg merge' to have better behavior in the presence of a branch that has closed heads when no explicit rev is passed.
18 lines
740 B
Plaintext
18 lines
740 B
Plaintext
adding foo
|
|
adding bar
|
|
adding baz
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
created new head
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
created new head
|
|
% fail with three heads
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
abort: branch 'default' has 3 heads - please merge with an explicit rev
|
|
% close one of the heads
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
% succeed with two open heads
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
0 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)
|