equal
deleted
inserted
replaced
216 |/ |
216 |/ |
217 o 0: b173517d0057 'a' |
217 o 0: b173517d0057 'a' |
218 |
218 |
219 $ hg rebase -r . -d 5 |
219 $ hg rebase -r . -d 5 |
220 rebasing 7:855e9797387e "added a back!" (tip) |
220 rebasing 7:855e9797387e "added a back!" (tip) |
221 abort: error: file 'a' cannot be written because 'a/' is a folder in 9b94b9373deb (containing 1 entries: a/a) |
221 saved backup bundle to $TESTTMP/repo1/repo2/.hg/strip-backup/855e9797387e-81ee4c5d-rebase.hg |
222 [255] |
222 |
|
223 $ hg tglog |
|
224 @ 7: bb3f02be2688 'added a back!' |
|
225 | |
|
226 | o 6: d14530e5e3e6 'added bar' |
|
227 | | |
|
228 o | 5: 9b94b9373deb 'added foo' |
|
229 |/ |
|
230 o 4: c6ad37a4f250 'a/a' |
|
231 | |
|
232 | o 3: 844a7de3e617 'c' |
|
233 | | |
|
234 o | 2: 09c044d2cb43 'd' |
|
235 | | |
|
236 o | 1: fc055c3b4d33 'b' |
|
237 |/ |
|
238 o 0: b173517d0057 'a' |
|
239 |
223 |
240 |
224 $ cd .. |
241 $ cd .. |
225 |
242 |
226 Test dry-run rebasing |
243 Test dry-run rebasing |
227 |
244 |