mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
502b9e407c
Patch written by Benoit Boissinot. This should probably be improved in the future to handle long-living branches, as joining two "other" heads will switch to that new head. But this is not a new problem, as adding to the "other" head would have switched to that new head, too.
32 lines
940 B
Plaintext
32 lines
940 B
Plaintext
adding foo
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
% should fail
|
|
pulling from ../tt
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
not updating, since new heads added
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
% should fail
|
|
pulling from ../t
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
not updating, since new heads added
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
merging foo
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
% should work
|
|
pulling from ../tt
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (-1 heads)
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|