mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 16:57:49 +03:00
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
|