equal
deleted
inserted
replaced
324 $ hg pull --config phases.publish=True -q -r 6 . # update phase of 6 |
324 $ hg pull --config phases.publish=True -q -r 6 . # update phase of 6 |
325 $ hg rebase -d 0 -b 6 |
325 $ hg rebase -d 0 -b 6 |
326 nothing to rebase |
326 nothing to rebase |
327 [1] |
327 [1] |
328 $ hg rebase -d 5 -b 6 |
328 $ hg rebase -d 5 -b 6 |
|
329 abort: can't rebase public changeset e1c4361dd923 |
|
330 (see 'hg help phases' for details) |
|
331 [255] |
|
332 $ hg rebase -d 5 -r '1 + (6::)' |
329 abort: can't rebase public changeset e1c4361dd923 |
333 abort: can't rebase public changeset e1c4361dd923 |
330 (see 'hg help phases' for details) |
334 (see 'hg help phases' for details) |
331 [255] |
335 [255] |
332 |
336 |
333 $ hg rebase -d 5 -b 6 --keep |
337 $ hg rebase -d 5 -b 6 --keep |