mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +03:00
b6695538ff
Two branches a and b starting at root, with commits interleaved like: root a0 a1 b0 a2 a3 b1 were converted in the following order: root a0 b0 a1 b1 a2 a3 Replace depth based toposort with a more classic traversal method.
30 lines
790 B
Plaintext
30 lines
790 B
Plaintext
marked working directory as branch branch0
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
% convert
|
|
3 adda
|
|
2 addb
|
|
pulling from default into branch0
|
|
1 changesets found
|
|
1 changea
|
|
0 mergeab
|
|
pulling from default into branch0
|
|
1 changesets found
|
|
marked working directory as branch branch1
|
|
marked working directory as branch branch2
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
marked working directory as branch branch3
|
|
% incremental conversion
|
|
2 c2
|
|
pulling from branch0 into branch2
|
|
2 changesets found
|
|
1 c1
|
|
pulling from branch0 into branch1
|
|
2 changesets found
|
|
0 c3
|
|
pulling from branch2 into branch3
|
|
3 changesets found
|
|
pulling from branch1 into branch3
|
|
1 changesets found
|