diff options
Diffstat (limited to 'tests/test-mq-safety.t')
| -rw-r--r-- | tests/test-mq-safety.t | 49 |
1 files changed, 4 insertions, 45 deletions
diff --git a/tests/test-mq-safety.t b/tests/test-mq-safety.t index d6fe35d..d184d8e 100644 --- a/tests/test-mq-safety.t +++ b/tests/test-mq-safety.t @@ -1,6 +1,5 @@ $ echo '[extensions]' >> $HGRCPATH - $ echo 'hgext.mq =' >> $HGRCPATH - $ echo 'hgext.graphlog =' >> $HGRCPATH + $ echo 'mq =' >> $HGRCPATH $ hg init repo $ cd repo @@ -18,35 +17,6 @@ $ echo bar >> foo $ hg qrefresh -m 'append bar' -Try to operate on public mq changeset - - $ hg qpop - popping bar - now at: foo - $ hg phase --public qbase - $ echo babar >> foo - $ hg qref - abort: cannot refresh immutable revision - (see "hg help phases" for details) - [255] - $ hg revert -a - reverting foo - $ hg qpop - abort: popping would remove an immutable revision - (see "hg help phases" for details) - [255] - $ hg qfold bar - abort: cannot refresh immutable revision - (see "hg help phases" for details) - [255] - $ hg revert -a - reverting foo - -restore state for remaining test - - $ hg qpush - applying bar - now at: bar try to commit on top of a patch @@ -69,7 +39,7 @@ qpop/qrefresh on the wrong revision abort: popping would remove a revision not managed by this patch queue [255] $ hg qpop -n patches - using patch queue: $TESTTMP/repo/.hg/patches (glob) + using patch queue: $TESTTMP/repo/.hg/patches abort: popping would remove a revision not managed by this patch queue [255] $ hg qrefresh @@ -106,7 +76,6 @@ qpush warning branchheads 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg branch b marked working directory as branch b - (branches are permanent and global, did you want a bookmark?) $ echo c > c $ hg ci -Amc adding c @@ -156,7 +125,6 @@ Testing applied patches, push and --force 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg branch branch marked working directory as branch branch - (branches are permanent and global, did you want a bookmark?) $ echo b > b $ hg ci -Am addb adding b @@ -174,7 +142,7 @@ Testing applied patches, push and --force Pushing applied patch with --rev without --force - $ hg push -r . ../forcepush2 + $ hg push -r default ../forcepush2 pushing to ../forcepush2 abort: source has mq patches applied [255] @@ -188,7 +156,7 @@ Pushing applied patch with branchhash, without --force Pushing revs excluding applied patch - $ hg push --new-branch -r 'branch(branch)' -r 2 ../forcepush2 + $ hg push --new-branch -r branch -r 2 ../forcepush2 pushing to ../forcepush2 searching for changes adding changesets @@ -198,13 +166,6 @@ Pushing revs excluding applied patch Pushing applied patch with --force - $ hg phase --force --secret 'mq()' - $ hg push --force -r default ../forcepush2 - pushing to ../forcepush2 - searching for changes - no changes found (ignored 1 secret changesets) - [1] - $ hg phase --draft 'mq()' $ hg push --force -r default ../forcepush2 pushing to ../forcepush2 searching for changes @@ -212,5 +173,3 @@ Pushing applied patch with --force adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - - $ cd .. |