Mercurial > hg
comparison tests/test-rebase-scenario-global.t @ 19059:53eadcb814fd
rebase: check no-op before checking phase (issue3891)
This could lead to user confusion, because phases aren't really involved at
all when attempting to perform a no-op rebase.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Thu, 18 Apr 2013 14:28:06 -0700 |
| parents | 3e92772d5383 |
| children | 9c78ed396075 |
comparison
equal
deleted
inserted
replaced
| 19058:d8d548d868d3 | 19059:53eadcb814fd |
|---|---|
| 274 | 274 |
| 275 | 275 |
| 276 Check rebasing public changeset | 276 Check rebasing public changeset |
| 277 | 277 |
| 278 $ hg pull --config phases.publish=True -q -r 6 . # update phase of 6 | 278 $ hg pull --config phases.publish=True -q -r 6 . # update phase of 6 |
| 279 $ hg rebase -d 0 -b 6 | |
| 280 nothing to rebase | |
| 281 [1] | |
| 279 $ hg rebase -d 5 -b 6 | 282 $ hg rebase -d 5 -b 6 |
| 280 abort: can't rebase immutable changeset e1c4361dd923 | 283 abort: can't rebase immutable changeset e1c4361dd923 |
| 281 (see hg help phases for details) | 284 (see hg help phases for details) |
| 282 [255] | 285 [255] |
| 283 | 286 |