equal
deleted
inserted
replaced
54 |/ |
54 |/ |
55 o 0: 'A' |
55 o 0: 'A' |
56 |
56 |
57 |
57 |
58 |
58 |
59 $ hg rebase -s 7 -d 8 |
59 $ hg rebase -s 1 -d 8 --keepbranches |
|
60 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
|
61 |
|
62 $ hg tglog |
|
63 @ 8: 'D' |
|
64 | |
|
65 o 7: 'C' |
|
66 | |
|
67 o 6: 'B' |
|
68 | |
|
69 o 5: 'extra named branch' dev |
|
70 | |
|
71 o 4: 'H' |
|
72 | |
|
73 | o 3: 'G' |
|
74 |/| |
|
75 o | 2: 'F' |
|
76 | | |
|
77 | o 1: 'E' |
|
78 |/ |
|
79 o 0: 'A' |
|
80 |
|
81 $ hg rebase -s 4 -d 5 |
60 abort: source is ancestor of destination |
82 abort: source is ancestor of destination |
61 [255] |
83 [255] |
62 |
84 |
63 $ hg rebase -s 8 -d 7 |
85 $ hg rebase -s 5 -d 4 |
64 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
86 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
65 |
87 |
66 $ hg tglog |
88 $ hg tglog |
67 @ 8: 'extra named branch' |
89 @ 8: 'D' |
68 | |
90 | |
69 o 7: 'H' |
91 o 7: 'C' |
70 | |
92 | |
71 | o 6: 'G' |
93 o 6: 'B' |
|
94 | |
|
95 o 5: 'extra named branch' |
|
96 | |
|
97 o 4: 'H' |
|
98 | |
|
99 | o 3: 'G' |
72 |/| |
100 |/| |
73 o | 5: 'F' |
101 o | 2: 'F' |
74 | | |
102 | | |
75 | o 4: 'E' |
103 | o 1: 'E' |
76 |/ |
|
77 | o 3: 'D' |
|
78 | | |
|
79 | o 2: 'C' |
|
80 | | |
|
81 | o 1: 'B' |
|
82 |/ |
104 |/ |
83 o 0: 'A' |
105 o 0: 'A' |
84 |
106 |
85 $ cd .. |
107 $ cd .. |