Mercurial > hg-stable
comparison tests/test-rebase-scenario-global.t @ 15742:65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Tue, 27 Dec 2011 00:11:22 +0100 |
| parents | 9910f60a37ee |
| children | e66084ef8449 |
comparison
equal
deleted
inserted
replaced
| 15741:60344b83e442 | 15742:65df60a3f96b |
|---|---|
| 1 $ cat >> $HGRCPATH <<EOF | 1 $ cat >> $HGRCPATH <<EOF |
| 2 > [extensions] | 2 > [extensions] |
| 3 > graphlog= | 3 > graphlog= |
| 4 > rebase= | 4 > rebase= |
| 5 > | |
| 6 > [phases] | |
| 7 > publish=False | |
| 5 > | 8 > |
| 6 > [alias] | 9 > [alias] |
| 7 > tglog = log -G --template "{rev}: '{desc}' {branches}\n" | 10 > tglog = log -G --template "{rev}: '{desc}' {branches}\n" |
| 8 > EOF | 11 > EOF |
| 9 | 12 |
| 267 |/ | 270 |/ |
| 268 | o 1: 'B' | 271 | o 1: 'B' |
| 269 |/ | 272 |/ |
| 270 o 0: 'A' | 273 o 0: 'A' |
| 271 | 274 |
| 275 | |
| 276 Check rebasing public changeset | |
| 277 | |
| 278 $ hg pull --config phases.publish=True -q -r 6 . # update phase of 6 | |
| 279 $ hg rebase -d 5 -b 6 | |
| 280 abort: Can't rebase immutable changeset e1c4361dd923 | |
| 281 (see hg help phases for details) | |
| 282 [255] | |
| 283 | |
| 284 $ hg rebase -d 5 -b 6 --keep | |
| 272 $ cd .. | 285 $ cd .. |
| 273 | 286 |
| 274 Test for revset | 287 Test for revset |
| 275 | 288 |
| 276 We need a bit different graph | 289 We need a bit different graph |