equal
deleted
inserted
replaced
67 | o 1: 'B' |
67 | o 1: 'B' |
68 |/ |
68 |/ |
69 o 0: 'A' |
69 o 0: 'A' |
70 |
70 |
71 $ hg rebase -s 1 -d 5 |
71 $ hg rebase -s 1 -d 5 |
72 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) |
72 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
73 |
73 |
74 $ hg tglog |
74 $ hg tglog |
75 @ 5: 'B' |
75 @ 5: 'B' |
76 | |
76 | |
77 o 4: 'F' |
77 o 4: 'F' |
91 |
91 |
92 $ hg clone -q -u . a a2 |
92 $ hg clone -q -u . a a2 |
93 $ cd a2 |
93 $ cd a2 |
94 |
94 |
95 $ hg rebase -s 1 -d 3 |
95 $ hg rebase -s 1 -d 3 |
96 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) |
96 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) |
97 |
97 |
98 $ hg tglog |
98 $ hg tglog |
99 @ 5: 'B' |
99 @ 5: 'B' |
100 | |
100 | |
101 | o 4: 'F' |
101 | o 4: 'F' |
115 |
115 |
116 $ hg clone -q -u . a a3 |
116 $ hg clone -q -u . a a3 |
117 $ cd a3 |
117 $ cd a3 |
118 |
118 |
119 $ hg rebase -s 2 -d 5 |
119 $ hg rebase -s 2 -d 5 |
120 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) |
120 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) |
121 |
121 |
122 $ hg tglog |
122 $ hg tglog |
123 @ 4: 'C' |
123 @ 4: 'C' |
124 | |
124 | |
125 o 3: 'F' |
125 o 3: 'F' |
137 |
137 |
138 $ hg clone -q -u . a a4 |
138 $ hg clone -q -u . a a4 |
139 $ cd a4 |
139 $ cd a4 |
140 |
140 |
141 $ hg rebase -s 3 -d 2 |
141 $ hg rebase -s 3 -d 2 |
142 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) |
142 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) |
143 |
143 |
144 $ hg tglog |
144 $ hg tglog |
145 @ 4: 'F' |
145 @ 4: 'F' |
146 | |
146 | |
147 o 3: 'D' |
147 o 3: 'D' |
159 |
159 |
160 $ hg clone -q -u . a a5 |
160 $ hg clone -q -u . a a5 |
161 $ cd a5 |
161 $ cd a5 |
162 |
162 |
163 $ hg rebase -s 4 -d 5 |
163 $ hg rebase -s 4 -d 5 |
164 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) |
164 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob) |
165 |
165 |
166 $ hg tglog |
166 $ hg tglog |
167 @ 5: 'E' |
167 @ 5: 'E' |
168 |\ |
168 |\ |
169 | o 4: 'F' |
169 | o 4: 'F' |
183 |
183 |
184 $ hg clone -q -u . a a6 |
184 $ hg clone -q -u . a a6 |
185 $ cd a6 |
185 $ cd a6 |
186 |
186 |
187 $ hg rebase -s 3 -d 1 |
187 $ hg rebase -s 3 -d 1 |
188 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) |
188 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob) |
189 |
189 |
190 $ hg tglog |
190 $ hg tglog |
191 @ 5: 'F' |
191 @ 5: 'F' |
192 | |
192 | |
193 | o 4: 'E' |
193 | o 4: 'E' |