equal
deleted
inserted
replaced
280 abort: Can't rebase immutable changeset e1c4361dd923 |
280 abort: Can't rebase immutable changeset e1c4361dd923 |
281 (see hg help phases for details) |
281 (see hg help phases for details) |
282 [255] |
282 [255] |
283 |
283 |
284 $ hg rebase -d 5 -b 6 --keep |
284 $ hg rebase -d 5 -b 6 --keep |
|
285 |
|
286 Check rebasing mutable changeset |
|
287 Source phase greater or equal to destination phase: new changeset get the phase of source: |
|
288 $ hg rebase -s9 -d0 |
|
289 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-backup.hg |
|
290 $ hg log --template "{phase}\n" -r 9 |
|
291 draft |
|
292 $ hg rebase -s9 -d1 |
|
293 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-backup.hg |
|
294 $ hg log --template "{phase}\n" -r 9 |
|
295 draft |
|
296 $ hg phase --force --secret 9 |
|
297 $ hg rebase -s9 -d0 |
|
298 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-backup.hg |
|
299 $ hg log --template "{phase}\n" -r 9 |
|
300 secret |
|
301 $ hg rebase -s9 -d1 |
|
302 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-backup.hg |
|
303 $ hg log --template "{phase}\n" -r 9 |
|
304 secret |
|
305 Source phase lower than destination phase: new changeset get the phase of destination: |
|
306 $ hg rebase -s7 -d9 |
|
307 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c9659aac0000-backup.hg |
|
308 $ hg log --template "{phase}\n" -r 9 |
|
309 secret |
|
310 |
285 $ cd .. |
311 $ cd .. |
286 |
312 |
287 Test for revset |
313 Test for revset |
288 |
314 |
289 We need a bit different graph |
315 We need a bit different graph |