mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
58 lines
1.0 KiB
Plaintext
58 lines
1.0 KiB
Plaintext
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
% "Mainstream" import p1.patch
|
|
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
|
applying p1.patch
|
|
|
|
% Rebase
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
saved backup bundle to
|
|
@ 3 P0 tags: p0.patch qbase qtip tip
|
|
|
|
|
o 2 P1 tags: qparent
|
|
|
|
|
o 1 R1 tags:
|
|
|
|
|
o 0 C1 tags:
|
|
|
|
|
|
% Now with --continue
|
|
adding r0
|
|
adding r1
|
|
adding r2
|
|
adding r3
|
|
adding r4
|
|
adding r5
|
|
adding r6
|
|
0 files updated, 0 files merged, 6 files removed, 0 files unresolved
|
|
adding r1
|
|
created new head
|
|
adding r3
|
|
adding r7
|
|
adding r8
|
|
adding r4
|
|
adding r6
|
|
3 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
|
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
|
|
saved backup bundle to
|
|
@ 9 r5 tags: 5.diff qtip tip
|
|
|
|
|
o 8 r4 tags: 4.diff
|
|
|
|
|
o 7 r2 tags: 2.diff qbase
|
|
|
|
|
o 6 branch2-r6 tags: qparent
|
|
|
|
|
o 5 branch2-r4 tags:
|
|
|
|
|
o 4 branch2-r8 tags:
|
|
|
|
|
o 3 branch2-r7 tags:
|
|
|
|
|
o 2 branch2-r3 tags:
|
|
|
|
|
o 1 branch2-r1 tags:
|
|
|
|
|
o 0 r0 tags:
|
|
|