Mercurial > evolve
changeset 6282:fe5c6771d51e mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 12 Jul 2022 19:02:08 +0400 |
| parents | 35523be9534a (diff) 2c36ef2eadd5 (current diff) |
| children | b8cc96e7ba99 3b486ae2e79a |
| files | |
| diffstat | 80 files changed, 307 insertions(+), 282 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-amend-patch.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-amend-patch.t Tue Jul 12 19:02:08 2022 +0400 @@ -666,7 +666,7 @@ $ hg add bar $ HGEDITOR=cat hg amend --patch abort: uncommitted changes - [20] + [255] $ hg revert --all forgetting bar
--- a/tests/test-discovery-obshashrange.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-discovery-obshashrange.t Tue Jul 12 19:02:08 2022 +0400 @@ -150,7 +150,6 @@ cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} $ rm ../server/.hg/blackbox.log $ hg blackbox - * @0000000000000000000000000000000000000000 (*)> 0/0 cache hits/lookups in *.???? seconds (glob) * @0000000000000000000000000000000000000000 (*)> clone *ssh://user@dummy/server* client exited 0 after *.?? seconds (glob) * @0000000000000000000000000000000000000000 (*)> pull --rev 4 (glob) * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (5r, 3o) (glob)
--- a/tests/test-evolve-abort-orphan.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-abort-orphan.t Tue Jul 12 19:02:08 2022 +0400 @@ -64,7 +64,7 @@ #else $ hg abort abort: no operation in progress - [20] + [255] #endif Testing with wrong combination of flags @@ -111,7 +111,7 @@ warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg parents changeset: 5:e93a9161a274 @@ -160,7 +160,7 @@ warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo foo > d $ hg resolve -m (no more unresolved files) @@ -190,7 +190,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] testing that interrupted evolve shows up in morestatus $ hg status -v @@ -304,7 +304,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg glog o 9:7f8e8bd9f0b6 added c @@ -371,7 +371,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg glog o 9:7f8e8bd9f0b6 added c | () draft @@ -451,7 +451,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg glog o 12:1c476940790a added d @@ -529,7 +529,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg glog @ 5:c1f4718020e3 added b @@ -578,7 +578,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg abort evolve aborted
--- a/tests/test-evolve-abort-phasediv.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-abort-phasediv.t Tue Jul 12 19:02:08 2022 +0400 @@ -105,7 +105,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] testing that interrupted evolve shows up in morestatus $ hg status -v @@ -224,7 +224,7 @@ warning: conflicts while merging b! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg abort 1 new phase-divergent changesets @@ -294,7 +294,7 @@ warning: conflicts while merging b! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo watwat > c $ hg resolve -m @@ -310,7 +310,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg abort 1 new phase-divergent changesets
--- a/tests/test-evolve-content-divergent-basic.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-content-divergent-basic.t Tue Jul 12 19:02:08 2022 +0400 @@ -336,7 +336,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo foobar > d $ hg resolve -m @@ -396,7 +396,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo watbar > d $ hg resolve -m @@ -607,7 +607,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ cat > a <<EOF > jungle
--- a/tests/test-evolve-content-divergent-case-A3.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-content-divergent-case-A3.t Tue Jul 12 19:02:08 2022 +0400 @@ -79,7 +79,7 @@ $ cd ../local $ hg pull -qu $ hg rebase -r 'desc(C)' -d 'desc(B)' - rebasing 3:928c8849ec01 tip "C" + rebasing 3:928c8849ec01 "C" (tip) $ cd ../other $ hg pull -qu
--- a/tests/test-evolve-content-divergent-case-A4.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-content-divergent-case-A4.t Tue Jul 12 19:02:08 2022 +0400 @@ -84,12 +84,12 @@ $ cd ../local $ hg pull -qu $ hg rebase -r 'desc(D)' -d 'desc(C)' - rebasing 4:6a418860e87b tip "D" + rebasing 4:6a418860e87b "D" (tip) $ cd ../other $ hg pull -qu $ hg rebase -r 'desc(D)' -d 'desc(B)' - rebasing 4:6a418860e87b tip "D" + rebasing 4:6a418860e87b "D" (tip) $ hg push -q $ cd ../local
--- a/tests/test-evolve-content-divergent-case-A5.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-content-divergent-case-A5.t Tue Jul 12 19:02:08 2022 +0400 @@ -73,7 +73,7 @@ $ cd ../local $ hg pull -qu $ hg rebase -r 'desc(C)' -d 'desc(A)' - rebasing 3:d90aa47aa5d3 tip "C" + rebasing 3:d90aa47aa5d3 "C" (tip) $ cd ../other $ hg pull -qu
--- a/tests/test-evolve-content-divergent-interrupted.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-content-divergent-interrupted.t Tue Jul 12 19:02:08 2022 +0400 @@ -90,7 +90,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg status -v M d @@ -204,7 +204,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg evolve --abort 2 new orphan changesets @@ -279,7 +279,7 @@ $ hg ci -m "added d" $ hg rebase -r . -d .^^^ --config extensions.rebase= - rebasing 5:f8b09dd867e5 tip "added d" + rebasing 5:f8b09dd867e5 "added d" (tip) $ echo bar > c $ hg add c $ hg amend @@ -318,7 +318,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg evolve --abort evolve aborted @@ -371,7 +371,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] this test case is mainly to test that we hit merge conlict while merging the two divergent csets, so resolving this one which happened during relocation @@ -389,7 +389,7 @@ 0 files updated, 0 files merged, 0 files removed, 2 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg evolve --abort evolve aborted @@ -481,7 +481,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg evolve --stop stopped the interrupted evolve @@ -508,7 +508,7 @@ --------------------------------------------------------------------------- $ hg rebase -r . -d .^^^ --config extensions.rebase= - rebasing 6:9c1631e352d9 tip "added d" + rebasing 6:9c1631e352d9 "added d" (tip) $ hg glog @ 7:517d4375cb72 added d @@ -534,7 +534,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg evolve --stop stopped the interrupted evolve @@ -593,7 +593,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg diff diff -r c7586e2a9264 a
--- a/tests/test-evolve-content-divergent-relocation.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-content-divergent-relocation.t Tue Jul 12 19:02:08 2022 +0400 @@ -337,7 +337,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo watbar > y $ hg resolve -m @@ -491,7 +491,7 @@ warning: conflicts while merging y! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg diff diff -r 26dd4974d99f y @@ -521,7 +521,7 @@ 1 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg diff diff -r 5049972c0e21 y @@ -654,7 +654,7 @@ The first side of the divergence get rebased on top of upstream. $ hg rebase -r . -d 'desc("upstream")' - rebasing 2:898ddd4443b3 tip "divergent" + rebasing 2:898ddd4443b3 "divergent" (tip) $ hg --hidden co 2 -q updated to hidden changeset 898ddd4443b3 (hidden revision '898ddd4443b3' was rewritten as: befae6138569)
--- a/tests/test-evolve-content-divergent-stack.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-content-divergent-stack.t Tue Jul 12 19:02:08 2022 +0400 @@ -272,7 +272,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo c > c $ hg resolve -m (no more unresolved files) @@ -285,7 +285,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg diff diff -r 5907cbc074a0 c --- a/c Thu Jan 01 00:00:00 1970 +0000 @@ -542,7 +542,7 @@ warning: conflicts while merging b! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo b > b $ hg resolve -m @@ -555,7 +555,7 @@ warning: conflicts while merging b! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo b > b $ hg resolve -m @@ -643,7 +643,7 @@ 4 new orphan changesets unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] As now we have interrupted evolution of stack of content-divergent cset (when relocation of "divergent" also included) let's test --abort and --stop @@ -744,7 +744,7 @@ 4 new orphan changesets unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg evolve --stop 2 new orphan changesets @@ -864,7 +864,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo foo > b $ hg resolve -m
--- a/tests/test-evolve-continue.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-continue.t Tue Jul 12 19:02:08 2022 +0400 @@ -70,7 +70,7 @@ warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo foo > d $ hg resolve -m @@ -132,7 +132,7 @@ warning: conflicts while merging e! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo bar > e $ hg resolve -m @@ -174,7 +174,7 @@ warning: conflicts while merging b! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo foo > b $ hg resolve -m @@ -261,7 +261,7 @@ warning: conflicts while merging f! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo foo > f $ hg resolve -m @@ -278,7 +278,7 @@ warning: conflicts while merging h! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo foo > h $ hg resolve -m @@ -327,7 +327,7 @@ warning: conflicts while merging g! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo foo > g $ hg resolve -m @@ -378,7 +378,7 @@ warning: conflicts while merging g! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo foo > g $ hg resolve -m (no more unresolved files) @@ -447,7 +447,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] Status mentions file 'b' (copied from 'a') here, even though it wasn't affected by the evolved changeset (nor was 'a') @@ -477,7 +477,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg st -C M a A d
--- a/tests/test-evolve-effectflags.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-effectflags.t Tue Jul 12 19:02:08 2022 +0400 @@ -128,7 +128,7 @@ $ mkcommit C0 $ mkcommit D0 $ hg rebase -r . -d 'desc(B0)' - rebasing 10:c85eff83a034 tip "D0" + rebasing 10:c85eff83a034 "D0" (tip) check result
--- a/tests/test-evolve-inmemory.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-inmemory.t Tue Jul 12 19:02:08 2022 +0400 @@ -70,7 +70,7 @@ warning: conflicts while merging B! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg glog @ 6:a2a0434af50b draft tip | C
--- a/tests/test-evolve-issue5966.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-issue5966.t Tue Jul 12 19:02:08 2022 +0400 @@ -59,7 +59,7 @@ atop:[4] apricot unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg evolve --list 34a690fcf6ab: banana orphan: 7f59f18ca4a9 (obsolete parent) @@ -73,13 +73,13 @@ U a $ hg evolve --continue abort: unresolved merge conflicts (see 'hg help resolve') - [20] + [255] (even when ran twice) $ hg evolve --continue abort: unresolved merge conflicts (see 'hg help resolve') - [20] + [255] $ cat a apricot
--- a/tests/test-evolve-issue5967.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-issue5967.t Tue Jul 12 19:02:08 2022 +0400 @@ -43,7 +43,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo apricot > a $ hg resolve --mark a
--- a/tests/test-evolve-issue6097.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-issue6097.t Tue Jul 12 19:02:08 2022 +0400 @@ -29,7 +29,7 @@ Now rebase the successor of 0 on top of 1 $ hg rebase -r . -d 1 - rebasing 2:32acf8fb1b23 tip "apricot and coconut" + rebasing 2:32acf8fb1b23 "apricot and coconut" (tip) 1 new orphan changesets Pruning 1 just to get it out of the way
--- a/tests/test-evolve-obshistory-amend-then-fold.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-obshistory-amend-then-fold.t Tue Jul 12 19:02:08 2022 +0400 @@ -352,7 +352,7 @@ } ] $ hg update 471f378eab4c - abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192 + abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192! (use --hidden to access hidden revisions) [255] $ hg update --hidden 'desc(A0)'
--- a/tests/test-evolve-obshistory-amend.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-obshistory-amend.t Tue Jul 12 19:02:08 2022 +0400 @@ -203,7 +203,7 @@ } ] $ hg update 471f378eab4c - abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9 + abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9! (use --hidden to access hidden revisions) [255] $ hg update --hidden "desc(A0)"
--- a/tests/test-evolve-obshistory-content-divergent.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-obshistory-content-divergent.t Tue Jul 12 19:02:08 2022 +0400 @@ -439,7 +439,7 @@ } ] $ hg update 471f378eab4c - abort: hidden revision '471f378eab4c' has diverged + abort: hidden revision '471f378eab4c' has diverged! (use --hidden to access hidden revisions) [255] $ hg update --hidden 'desc(A0)'
--- a/tests/test-evolve-obshistory-fold.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-obshistory-fold.t Tue Jul 12 19:02:08 2022 +0400 @@ -289,7 +289,7 @@ } ] $ hg update 471f378eab4c - abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192 + abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192! (use --hidden to access hidden revisions) [255] $ hg update --hidden 'desc(A0)' @@ -299,7 +299,7 @@ working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: eb5a0daa2192) $ hg update 0dec01379d3b - abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192 + abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192! (use --hidden to access hidden revisions) [255] $ hg update --hidden 'desc(B0)'
--- a/tests/test-evolve-obshistory-lots-of-splits.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-obshistory-lots-of-splits.t Tue Jul 12 19:02:08 2022 +0400 @@ -444,7 +444,7 @@ x de7290d8b885 (1) A0 $ hg update de7290d8b885 - abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more + abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more! (use --hidden to access hidden revisions) [255] $ hg update --hidden 'min(desc(A0))'
--- a/tests/test-evolve-obshistory-prune.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-obshistory-prune.t Tue Jul 12 19:02:08 2022 +0400 @@ -105,7 +105,7 @@ $ hg up 1 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg up 0dec01379d3b - abort: hidden revision '0dec01379d3b' is pruned + abort: hidden revision '0dec01379d3b' is pruned! (use --hidden to access hidden revisions) [255] $ hg up --hidden -r 'desc(B0)'
--- a/tests/test-evolve-obshistory-split.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-obshistory-split.t Tue Jul 12 19:02:08 2022 +0400 @@ -256,7 +256,7 @@ x 471597cad322 (1) A0 $ hg update 471597cad322 - abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a + abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a! (use --hidden to access hidden revisions) [255] $ hg update --hidden 'min(desc(A0))'
--- a/tests/test-evolve-orphan-merge.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-orphan-merge.t Tue Jul 12 19:02:08 2022 +0400 @@ -209,7 +209,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo FOObar > c $ hg resolve -m @@ -265,7 +265,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo foobar > c $ hg resolve -m
--- a/tests/test-evolve-orphan-split.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-orphan-split.t Tue Jul 12 19:02:08 2022 +0400 @@ -177,7 +177,7 @@ () draft $ hg rebase -r . -d 8fa14d15e168 - rebasing 9:c0fbf8aaf6c4 tip "added a b c" + rebasing 9:c0fbf8aaf6c4 "added a b c" (tip) $ hg glog @ 10:7f87764e5b64 added a b c | () draft
--- a/tests/test-evolve-phase-divergence.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-phase-divergence.t Tue Jul 12 19:02:08 2022 +0400 @@ -570,7 +570,7 @@ $ cd ../alice $ hg rebase -r . -d .^^^ - rebasing 9:2352021b3785 bm tip "added x to x" + rebasing 9:2352021b3785 "added x to x" (bm tip) $ hg pull ../public pulling from ../public @@ -699,7 +699,7 @@ $ hg add y $ hg ci -m "y to y and foobar to foo" $ hg rebase -r . -d .^^^ - rebasing 12:dc88f5aa9bc9 tip "y to y and foobar to foo" + rebasing 12:dc88f5aa9bc9 "y to y and foobar to foo" (tip) $ echo foo > y $ hg amend @@ -806,7 +806,7 @@ $ echo l > l $ hg ci -Aqm "added l to l" $ hg rebase -r . -d .^^^^ - rebasing 17:f3794e5a91dc tip "added l to l" + rebasing 17:f3794e5a91dc "added l to l" (tip) $ echo kl > l $ echo foo > x $ hg add x @@ -852,7 +852,7 @@ warning: conflicts while merging x! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg diff diff -r 8c2bb6fb44e9 l
--- a/tests/test-evolve-phase.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-phase.t Tue Jul 12 19:02:08 2022 +0400 @@ -97,7 +97,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg diff diff -r 87495ea7c9ec a
--- a/tests/test-evolve-progress.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-progress.t Tue Jul 12 19:02:08 2022 +0400 @@ -136,7 +136,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo resolved > a $ hg resolve -m a (no more unresolved files)
--- a/tests/test-evolve-public-content-divergent-corner-cases.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-public-content-divergent-corner-cases.t Tue Jul 12 19:02:08 2022 +0400 @@ -396,7 +396,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg diff diff -r 155349b645be c @@ -427,7 +427,7 @@ 1 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg sum parent: 5:93cd84bbdaca @@ -507,7 +507,7 @@ $ node=`hg log --rev 'desc("c_E")' -T '{node}'` $ hg rebase -s $node -d 'desc("c_B")' rebasing 5:4ab2719bbab9 "c_E" - rebasing 6:77ccbf8d837e tip "c_F" + rebasing 6:77ccbf8d837e "c_F" (tip) $ hg phase --public tip $ hg rebase --hidden -s $node -d 'desc("c_C")' --config experimental.evolution.allowdivergence=yes rebasing 5:4ab2719bbab9 "c_E"
--- a/tests/test-evolve-public-content-divergent-discard.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-public-content-divergent-discard.t Tue Jul 12 19:02:08 2022 +0400 @@ -273,7 +273,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg diff diff -r f7c1071f1e7c ch @@ -387,7 +387,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo c > c $ hg resolve -m @@ -492,7 +492,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo dh > dh $ hg resolve -m @@ -595,7 +595,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo c > c $ hg resolve -m @@ -609,7 +609,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo dh > dh $ hg resolve -m
--- a/tests/test-evolve-public-content-divergent-main.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-public-content-divergent-main.t Tue Jul 12 19:02:08 2022 +0400 @@ -174,7 +174,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo "I am foobar" > b $ hg resolve -m --tool union @@ -361,7 +361,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg diff diff -r 155349b645be c @@ -492,7 +492,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo d > d $ hg resolve -m @@ -584,7 +584,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg diff diff -r 155349b645be c @@ -619,7 +619,7 @@ 2 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo d > d $ hg resolve -m
--- a/tests/test-evolve-serveronly-legacy.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-serveronly-legacy.t Tue Jul 12 19:02:08 2022 +0400 @@ -56,5 +56,5 @@ abort: remote error: incompatible Mercurial client; bundle2 required (see https://www.mercurial-scm.org/wiki/IncompatibleClient) - [100] + [255] $ cat ../errors.log
--- a/tests/test-evolve-stop-orphan.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-stop-orphan.t Tue Jul 12 19:02:08 2022 +0400 @@ -102,7 +102,7 @@ warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg evolve --stop stopped the interrupted evolve @@ -150,7 +150,7 @@ warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg diff diff -r cb6a2ab625bb d @@ -213,7 +213,7 @@ warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo foo > d $ hg resolve -m (no more unresolved files) @@ -265,7 +265,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg status M c @@ -305,7 +305,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo foobar > c $ hg resolve -m @@ -382,7 +382,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg evolve --stop stopped the interrupted evolve
--- a/tests/test-evolve-stop-phasediv.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-stop-phasediv.t Tue Jul 12 19:02:08 2022 +0400 @@ -94,7 +94,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg evolve --stop stopped the interrupted evolve
--- a/tests/test-evolve-topic.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-topic.t Tue Jul 12 19:02:08 2022 +0400 @@ -332,9 +332,9 @@ different topic $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase= - rebasing 16:d2dc89c57700 bar "add iii" + rebasing 16:d2dc89c57700 "add iii" (bar) 1 new orphan changesets - rebasing 17:9bf430c106b7 bar "add jjj" + rebasing 17:9bf430c106b7 "add jjj" (bar) 1 new orphan changesets $ hg log -Gr 42b49017ff90:: * 21 - {bar} 7542e76aba2c add jjj (draft) @@ -422,7 +422,7 @@ warning: conflicts while merging hhh! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo "resolved hhh" > hhh $ hg resolve --mark hhh (no more unresolved files)
--- a/tests/test-evolve-wdir.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve-wdir.t Tue Jul 12 19:02:08 2022 +0400 @@ -194,7 +194,7 @@ when split csets are on multiple topological branches $ hg rebase -r 'max(desc(c_XYZ))' -d 'desc(u_B)' - rebasing 9:b7ec9e61ccbf tip "c_XYZ" + rebasing 9:b7ec9e61ccbf "c_XYZ" (tip) $ hg glog @ 10:cadaa9246c55 (draft): c_XYZ | @@ -222,7 +222,7 @@ q: quit the prompt enter the index of the revision you want to select: q abort: user quit - [250] + [255] $ hg evolve --config ui.interactive=True << EOF > 1
--- a/tests/test-evolve.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-evolve.t Tue Jul 12 19:02:08 2022 +0400 @@ -470,23 +470,6 @@ (/ninja) -command-templates.oneline-summary is respected when evolving orphan - - $ hg evolve -n --config 'command-templates.oneline-summary = custom {rev} {desc}' - move:custom 8 dansk 2! - atop:custom 10 dansk! - hg rebase -r 569625323d3e -d 9975c016fe7b - skipping 8163b3ed62c7, consider including orphan ancestors - -command-templates.oneline-summary is respected when evolving/updating working copy - - $ hg co -q 7 - working directory parent is obsolete! (aca219761afb) - $ hg evolve --no-all --config 'command-templates.oneline-summary = custom {rev} {desc}' - update:custom 10 dansk! - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory is now at 9975c016fe7b - $ hg evolve --all --traceback move:[8] dansk 2! atop:[10] dansk! @@ -655,7 +638,7 @@ merging 1 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see hg help resolve) - [240] + [1] $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' 7:a5bfd90a2f29 $ echo 3 > 1 @@ -1181,11 +1164,11 @@ $ hg next hg: unknown command 'next' (use 'hg help' for a list of commands) - [10] + [255] $ hg fold hg: unknown command 'fold' (use 'hg help' for a list of commands) - [10] + [255] Enabling commands selectively, only fold enabled, next is still unknown $ cat >> $HGRCPATH <<EOF > [experimental] @@ -1198,7 +1181,7 @@ $ hg next hg: unknown command 'next' (use 'hg help' for a list of commands) - [10] + [255] Shows "use 'hg evolve' to..." hints iff the evolve command is enabled @@ -1423,7 +1406,7 @@ warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ glog -r "desc('add unstableifparentisfolded')::" --hidden @ 33:b9acdb1af6d5@default(draft) will be evolved safely
--- a/tests/test-exchange-obsmarkers-case-A3.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-exchange-obsmarkers-case-A3.t Tue Jul 12 19:02:08 2022 +0400 @@ -229,9 +229,9 @@ $ hg push -R main -r 'desc(A1)' pushdest pushing to pushdest searching for changes - abort: push creates new remote head e5ea8f9c7314 + abort: push creates new remote head e5ea8f9c7314! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ cd .. test obsmarkers exchange.
--- a/tests/test-extension-isolation.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-extension-isolation.t Tue Jul 12 19:02:08 2022 +0400 @@ -42,12 +42,12 @@ warning: --repository ignored abort: no such help topic: evolve (try 'hg help --keyword evolve') - [10] + [255] $ hg -R repo-no-ext help -e topic warning: --repository ignored abort: no such help topic: topic (try 'hg help --keyword topic') - [10] + [255] start hgweb dir for all repo
--- a/tests/test-fixup.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-fixup.t Tue Jul 12 19:02:08 2022 +0400 @@ -175,7 +175,7 @@ warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg diff diff --git a/foo b/foo @@ -208,7 +208,7 @@ warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg abort fixup aborted @@ -221,7 +221,7 @@ warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg status --verbose M foo @@ -364,7 +364,7 @@ --abort abort an interrupted fixup (use 'hg fixup -h' to show more help) - [10] + [255] $ hg fixup :10 -r 5 abort: please specify just one revision
--- a/tests/test-fold.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-fold.t Tue Jul 12 19:02:08 2022 +0400 @@ -144,7 +144,7 @@ (test inherited from test-evolve.t) $ hg fold --from 6 # want to run hg fold 6 - abort: hidden revision '6' was rewritten as: 198b5c405d01 + abort: hidden revision '6' was rewritten as: 198b5c405d01! (use --hidden to access hidden revisions) [255]
--- a/tests/test-issue-5720.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-issue-5720.t Tue Jul 12 19:02:08 2022 +0400 @@ -63,7 +63,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] Fix the conflict $ echo c2 > a
--- a/tests/test-minitopic.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-minitopic.t Tue Jul 12 19:02:08 2022 +0400 @@ -85,15 +85,15 @@ $ hg push enabled pushing to http://localhost:$HGPORT/ searching for changes - abort: push creates new remote head 22c9514ed811 + abort: push creates new remote head 22c9514ed811! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg push disabled pushing to http://localhost:$HGPORT2/ searching for changes - abort: push creates new remote head 22c9514ed811 + abort: push creates new remote head 22c9514ed811! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg debugdownload http://localhost:$HGPORT/?cmd=branchmap | sort default 0ab6d544d0efd629fda056601cfe95e73d1af210 @@ -151,9 +151,9 @@ $ hg push disabled pushing to http://localhost:$HGPORT2/ searching for changes - abort: push creates new remote head f31af349535e + abort: push creates new remote head f31af349535e! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg push enabled pushing to http://localhost:$HGPORT/ searching for changes @@ -220,9 +220,9 @@ $ hg push enabled pushing to http://localhost:$HGPORT/ searching for changes - abort: push creates new remote head 82c5842e0472 on branch 'default:topic_A' + abort: push creates new remote head 82c5842e0472 on branch 'default:topic_A'! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg push disabled pushing to http://localhost:$HGPORT2/ searching for changes
--- a/tests/test-next-abort.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-next-abort.t Tue Jul 12 19:02:08 2022 +0400 @@ -27,7 +27,7 @@ warning: conflicts while merging b! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] #testcases abortcommand abortflag #if abortflag @@ -43,10 +43,10 @@ $ hg next --abort --move-bookmark abort: cannot specify both --abort and --move-bookmark - [10] + [255] $ hg next --abort --merge abort: cannot specify both --abort and --merge - [10] + [255] #else $ hg abort --dry-run evolve in progress, will be aborted @@ -55,7 +55,7 @@ working directory is now at 1c7f51cf0ef0 $ hg abort abort: no operation in progress - [20] + [255] #endif $ cd ..
--- a/tests/test-obsolete.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-obsolete.t Tue Jul 12 19:02:08 2022 +0400 @@ -170,7 +170,7 @@ $ hg init ../other-new $ hg phase --draft 'secret() - extinct()' # until we fix exclusion abort: empty revision set - [10] + [255] $ hg push ../other-new pushing to ../other-new searching for changes @@ -309,7 +309,7 @@ .. $ hg push ../other-old .. pushing to ../other-old .. searching for changes -.. abort: push includes an unstable changeset: 909a0fb57e5d +.. abort: push includes an unstable changeset: 909a0fb57e5d! .. (use 'hg evolve' to get a stable history or --force to ignore warnings) .. [255] .. $ hg push -f ../other-old
--- a/tests/test-options.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-options.t Tue Jul 12 19:02:08 2022 +0400 @@ -27,4 +27,4 @@ $ hg prune hg: unknown command 'prune' (use 'hg help' for a list of commands) - [10] + [255]
--- a/tests/test-pick.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-pick.t Tue Jul 12 19:02:08 2022 +0400 @@ -92,7 +92,7 @@ #if abortcommand $ hg abort abort: no operation in progress - [20] + [255] #endif Specifying both continue and revs @@ -199,7 +199,7 @@ merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see hg help resolve) - [240] + [1] $ echo foobar > c $ hg resolve --all --mark @@ -237,7 +237,7 @@ merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see hg help resolve) - [240] + [1] $ echo foobar > c $ hg resolve -m (no more unresolved files) @@ -262,7 +262,7 @@ merging b warning: conflicts while merging b! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see hg help resolve) - [240] + [1] #if abortcommand $ hg abort --dry-run @@ -323,7 +323,7 @@ merging b warning: conflicts while merging b! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see hg help resolve) - [240] + [1] $ echo bar > b $ hg resolve -m @@ -462,7 +462,7 @@ merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see hg help resolve) - [240] + [1] $ hg resolve -t :other a (no more unresolved files) continue: hg pick --continue
--- a/tests/test-prev-next.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-prev-next.t Tue Jul 12 19:02:08 2022 +0400 @@ -125,14 +125,14 @@ $ hg prev abort: uncommitted changes (do you want --merge?) - [20] + [255] $ hg prev --merge 0 files updated, 0 files merged, 1 files removed, 0 files unresolved [0] added a $ hg next abort: uncommitted changes (do you want --merge?) - [20] + [255] $ hg next --merge 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [1] added b @@ -380,7 +380,7 @@ $ hg next --evolve abort: uncommitted changes (use `hg amend`, `hg revert` or `hg shelve`) - [20] + [255] $ cd .. @@ -471,7 +471,7 @@ $ hg prev --config commands.update.check=abort abort: uncommitted changes (do you want --merge?) - [20] + [255] $ hg prev --merge --config commands.update.check=abort file 'bar' was deleted in other [destination] but was modified in local [working copy]. You can use (c)hanged version, (d)elete, or leave (u)nresolved. @@ -492,7 +492,7 @@ $ hg next --config commands.update.check=abort abort: uncommitted changes (do you want --merge?) - [20] + [255] $ hg next --merge --config commands.update.check=abort merging bar warning: conflicts while merging bar! (edit, then use 'hg resolve --mark') @@ -611,6 +611,49 @@ $ cd .. +hg next --abort + + $ hg init next-abort + $ cd next-abort + + $ echo apple > a + $ hg ci -qAm apple + $ echo banana > b + $ hg ci -qAm banana + $ hg up 0 + 0 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ echo blueberry > b + $ hg ci -qAm 'apple and blueberry' --amend + 1 new orphan changesets + + $ hg next + move:[1] banana + atop:[2] apple and blueberry + merging b + warning: conflicts while merging b! (edit, then use 'hg resolve --mark') + unresolved merge conflicts + (see 'hg help evolve.interrupted') + [1] + + $ hg next --abort + next aborted + working directory is now at 1c7f51cf0ef0 + $ hg next --abort + abort: no interrupted next to abort + [255] + $ hg evolve --abort + abort: no interrupted evolve to abort + [255] + + $ hg next --abort --move-bookmark + abort: cannot specify both --abort and --move-bookmark + [255] + $ hg next --abort --merge + abort: cannot specify both --abort and --merge + [255] + + $ cd .. + Testing --merge and --evolve flags: 1 child, 1 aspchild, dirty working copy $ hg init next-dirty-evolve @@ -651,15 +694,15 @@ $ hg next --no-merge --evolve --dry-run abort: uncommitted changes (use `hg amend`, `hg revert` or `hg shelve`) - [20] + [255] $ hg next --no-merge --no-evolve --dry-run abort: uncommitted changes (do you want --merge?) - [20] + [255] $ hg next --merge --no-evolve --dry-run hg update db0dc1f00682; [4] durian $ hg next --merge --evolve --dry-run abort: uncommitted changes (use `hg amend`, `hg revert` or `hg shelve`) - [20] + [255]
--- a/tests/test-prune.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-prune.t Tue Jul 12 19:02:08 2022 +0400 @@ -304,7 +304,7 @@ bookmark 'todelete' deleted 1 changesets pruned $ hg id -ir dcbb326fdec2 - abort: hidden revision 'dcbb326fdec2' is pruned + abort: hidden revision 'dcbb326fdec2' is pruned! (use --hidden to access hidden revisions) [255] $ hg id -ir d62d843c9a01 @@ -338,7 +338,7 @@ 3 changesets pruned $ hg tag --remove --local c $ hg id -ir 6:2702dd0c91e7 - abort: hidden revision '6' is pruned + abort: hidden revision '6' is pruned! (use --hidden to access hidden revisions) [255]
--- a/tests/test-push-checkheads-mixed-branch-topic-G3.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-push-checkheads-mixed-branch-topic-G3.t Tue Jul 12 19:02:08 2022 +0400 @@ -90,8 +90,8 @@ $ hg push -r 'desc("C1")' pushing to $TESTTMP/E1/server searching for changes - abort: push creates new remote head dc44c53142f0 + abort: push creates new remote head dc44c53142f0! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ cd ../..
--- a/tests/test-push-checkheads-multi-topics-F3.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-push-checkheads-multi-topics-F3.t Tue Jul 12 19:02:08 2022 +0400 @@ -94,8 +94,8 @@ $ hg push -r 'desc("C1")' pushing to $TESTTMP/E1/server searching for changes - abort: push creates new remote head 57530ca5eb24 on branch 'default:Y' + abort: push creates new remote head 57530ca5eb24 on branch 'default:Y'! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ cd ../..
--- a/tests/test-push-checkheads-multibranches-E3.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-push-checkheads-multibranches-E3.t Tue Jul 12 19:02:08 2022 +0400 @@ -90,8 +90,8 @@ $ hg push -r 'desc("C1")' pushing to $TESTTMP/E1/server searching for changes - abort: push creates new remote head dc44c53142f0 + abort: push creates new remote head dc44c53142f0! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ cd ../..
--- a/tests/test-push-checkheads-partial-C1.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-push-checkheads-partial-C1.t Tue Jul 12 19:02:08 2022 +0400 @@ -77,6 +77,6 @@ $ hg push pushing to $TESTTMP/server searching for changes - abort: push creates new remote head 25c56d33e4c4 + abort: push creates new remote head 25c56d33e4c4! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255]
--- a/tests/test-push-checkheads-partial-C2.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-push-checkheads-partial-C2.t Tue Jul 12 19:02:08 2022 +0400 @@ -79,8 +79,8 @@ $ hg push --rev 'desc(A1)' pushing to $TESTTMP/C2/server (glob) searching for changes - abort: push creates new remote head f6082bc4ffef + abort: push creates new remote head f6082bc4ffef! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ cd ../..
--- a/tests/test-push-checkheads-partial-C3.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-push-checkheads-partial-C3.t Tue Jul 12 19:02:08 2022 +0400 @@ -78,8 +78,8 @@ $ hg push pushing to $TESTTMP/C3/server (glob) searching for changes - abort: push creates new remote head 0f88766e02d6 + abort: push creates new remote head 0f88766e02d6! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ cd ../..
--- a/tests/test-push-checkheads-partial-C4.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-push-checkheads-partial-C4.t Tue Jul 12 19:02:08 2022 +0400 @@ -79,8 +79,8 @@ $ hg push --rev 'desc(C0)' pushing to $TESTTMP/C4/server (glob) searching for changes - abort: push creates new remote head 0f88766e02d6 + abort: push creates new remote head 0f88766e02d6! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ cd ../..
--- a/tests/test-push-checkheads-unpushed-D1.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-push-checkheads-unpushed-D1.t Tue Jul 12 19:02:08 2022 +0400 @@ -71,9 +71,9 @@ $ hg push -r 'desc(B0)' pushing to $TESTTMP/D1/server (glob) searching for changes - abort: push creates new remote head 74ff5441d343 + abort: push creates new remote head 74ff5441d343! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ cd ../..
--- a/tests/test-push-checkheads-unpushed-D2.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-push-checkheads-unpushed-D2.t Tue Jul 12 19:02:08 2022 +0400 @@ -92,8 +92,8 @@ $ hg push --rev 'desc(C0)' pushing to $TESTTMP/D2/server (glob) searching for changes - abort: push creates new remote head 0f88766e02d6 + abort: push creates new remote head 0f88766e02d6! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ cd ../..
--- a/tests/test-push-checkheads-unpushed-D3.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-push-checkheads-unpushed-D3.t Tue Jul 12 19:02:08 2022 +0400 @@ -91,15 +91,15 @@ $ hg push --rev 'desc(A1)' pushing to $TESTTMP/D3/server (glob) searching for changes - abort: push creates new remote head f6082bc4ffef + abort: push creates new remote head f6082bc4ffef! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg push --rev 'desc(B1)' pushing to $TESTTMP/D3/server (glob) searching for changes - abort: push creates new remote head 25c56d33e4c4 + abort: push creates new remote head 25c56d33e4c4! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] Extra testing ------------- @@ -109,8 +109,8 @@ $ hg push pushing to $TESTTMP/D3/server (glob) searching for changes - abort: push creates new remote head 25c56d33e4c4 + abort: push creates new remote head 25c56d33e4c4! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ cd ../..
--- a/tests/test-push-checkheads-unpushed-D4.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-push-checkheads-unpushed-D4.t Tue Jul 12 19:02:08 2022 +0400 @@ -109,9 +109,9 @@ $ hg push --rev 'desc(A1)' pushing to $TESTTMP/D4/server (glob) searching for changes - abort: push creates new remote head f6082bc4ffef + abort: push creates new remote head f6082bc4ffef! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] Actual testing (existing branch only) ------------------------------------
--- a/tests/test-push-checkheads-unpushed-D5.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-push-checkheads-unpushed-D5.t Tue Jul 12 19:02:08 2022 +0400 @@ -98,9 +98,9 @@ $ hg push --rev 'desc(B1)' pushing to $TESTTMP/D5/server (glob) searching for changes - abort: push creates new remote head 25c56d33e4c4 + abort: push creates new remote head 25c56d33e4c4! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg push --rev 'desc(A1)' pushing to $TESTTMP/D5/server (glob) searching for changes
--- a/tests/test-push-checkheads-unpushed-D6.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-push-checkheads-unpushed-D6.t Tue Jul 12 19:02:08 2022 +0400 @@ -79,8 +79,8 @@ $ hg push --rev 'desc(C0)' pushing to $TESTTMP/D6/server (glob) searching for changes - abort: push creates new remote head 0f88766e02d6 + abort: push creates new remote head 0f88766e02d6! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ cd ../..
--- a/tests/test-rewind.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-rewind.t Tue Jul 12 19:02:08 2022 +0400 @@ -1202,13 +1202,13 @@ $ hg rewind --to 'desc("amended")' --hidden abort: uncommitted changes - [20] + [255] XXX: Unfortunately, even with --keep it's not allowed $ hg rewind --keep --to 'desc("amended")' --hidden abort: uncommitted changes - [20] + [255] $ cd ..
--- a/tests/test-sharing.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-sharing.t Tue Jul 12 19:02:08 2022 +0400 @@ -345,9 +345,9 @@ pushing to ../public searching for changes remote has heads on branch 'default' that are not known locally: 9d21d673314a - abort: push creates new remote head 3363442626b3 with bookmark 'bug15' + abort: push creates new remote head 3363442626b3 with bookmark 'bug15'! (pull and merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg pull ../public pulling from ../public searching for changes @@ -379,7 +379,7 @@ Alice rebases her draft changeset on top of Bob's public changeset and publishes the result. $ hg rebase -d 4 - rebasing 3:3363442626b3 bug15 "fix bug 15 (v2)" + rebasing 3:3363442626b3 "fix bug 15 (v2)" (bug15) $ hg push ../public pushing to ../public searching for changes
--- a/tests/test-split.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-split.t Tue Jul 12 19:02:08 2022 +0400 @@ -127,7 +127,7 @@ $ echo "_cd" > _c $ hg split abort: uncommitted changes - [20] + [255] $ hg up "desc(_c)" -C 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -371,7 +371,7 @@ (enter ? for help) [Ynesfdaq?] q abort: user quit - [250] + [255] Running split with tip revision, specified as unnamed argument $ hg split --rev . << EOF @@ -385,7 +385,7 @@ (enter ? for help) [Ynesfdaq?] q abort: user quit - [250] + [255] Running split with both unnamed and named revision arguments shows an error msg $ hg split --rev . --rev .^ << EOF @@ -637,7 +637,7 @@ (enter ? for help) [Ynesfdaq?] q abort: user quit - [250] + [255] $ hg branch another-branch
--- a/tests/test-stabilize-conflict.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-stabilize-conflict.t Tue Jul 12 19:02:08 2022 +0400 @@ -128,7 +128,7 @@ warning: conflicts while merging babar! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg resolve -l U babar $ hg log -G @@ -221,7 +221,7 @@ merging babar failed! unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg resolve -l U babar $ hg log -G
--- a/tests/test-topic-change.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-topic-change.t Tue Jul 12 19:02:08 2022 +0400 @@ -180,13 +180,13 @@ Added a () $ hg rebase -s 11 -d 22 - rebasing 11:1315a3808ed0 foo "Added d" + rebasing 11:1315a3808ed0 "Added d" (foo) switching to topic foo - rebasing 16:edc4a6b9ea60 bar "Added e" + rebasing 16:edc4a6b9ea60 "Added e" (bar) switching to topic bar - rebasing 17:82e0b14f4d9e bar "Added f" - rebasing 18:e7b418d79a05 bar "Added g" - rebasing 20:c2d6b7df5dcf foobar "Added h" + rebasing 17:82e0b14f4d9e "Added f" (bar) + rebasing 18:e7b418d79a05 "Added g" (bar) + rebasing 20:c2d6b7df5dcf "Added h" (foobar) switching to topic foobar $ hg glog
--- a/tests/test-topic-dest.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-topic-dest.t Tue Jul 12 19:02:08 2022 +0400 @@ -113,7 +113,7 @@ switching to topic elephant 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg rebase - rebasing 4:cb7ae72f4a80 elephant "babar" + rebasing 4:cb7ae72f4a80 "babar" (elephant) switching to topic elephant $ hg log -G @ 7 (elephant) babar @@ -134,7 +134,7 @@ switching to topic monkey 1 files updated, 0 files merged, 3 files removed, 0 files unresolved $ hg rebase - rebasing 5:d832ddc604ec monkey "zephir" + rebasing 5:d832ddc604ec "zephir" (monkey) switching to topic monkey $ hg log -G @ 8 (monkey) zephir @@ -177,7 +177,7 @@ o 0 () c_alpha $ hg rebase - rebasing 9:d79a104e2902 tip monkey "Huc" + rebasing 9:d79a104e2902 "Huc" (tip monkey) $ hg log -G @ 10 (monkey) Huc | @@ -229,7 +229,7 @@ switching to topic elephant 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg rebase -d 'desc(c_zeta)' # make sure tip is elsewhere - rebasing 7:8d0b77140b05 elephant "babar" + rebasing 7:8d0b77140b05 "babar" (elephant) switching to topic elephant $ hg up monkey switching to topic monkey
--- a/tests/test-topic-flow-publish-flag.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-topic-flow-publish-flag.t Tue Jul 12 19:02:08 2022 +0400 @@ -399,9 +399,9 @@ $ hg push -r 'desc("c_dN0")' --publish pushing to $TESTTMP/bare-branch-server searching for changes - abort: push creates new remote head 4dcd0be9db96 + abort: push creates new remote head 4dcd0be9db96! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg tgl 'all()' @ 14:4dcd0be9db96 c_dN0 draft default topic_B |
--- a/tests/test-topic-push.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-topic-push.t Tue Jul 12 19:02:08 2022 +0400 @@ -81,9 +81,9 @@ $ hg push pushing to $TESTTMP/main (glob) searching for changes - abort: push creates new remote head 9fe81b7f425d + abort: push creates new remote head 9fe81b7f425d! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg outgoing -r 'desc(CB)' -G comparing with $TESTTMP/main (glob) searching for changes @@ -111,9 +111,9 @@ $ hg push pushing to $TESTTMP/main (glob) searching for changes - abort: push creates new remote branches: mountain + abort: push creates new remote branches: mountain! (use 'hg push --new-branch' to create new remote branches) - [20] + [255] $ hg push --new-branch pushing to $TESTTMP/main (glob) searching for changes @@ -210,10 +210,10 @@ $ hg outgoing draft --topic nonexistent - abort: topic 'nonexistent' does not exist + abort: topic 'nonexistent' does not exist! [255] $ hg push draft --topic nonexistent - abort: topic 'nonexistent' does not exist + abort: topic 'nonexistent' does not exist! [255] $ hg up babar @@ -254,9 +254,9 @@ $ hg push pushing to $TESTTMP/main (glob) searching for changes - abort: push creates new remote head 67f579af159d + abort: push creates new remote head 67f579af159d! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg log -G @ 4 default babar draft CD | @@ -300,9 +300,9 @@ $ hg push ssh://user@dummy/draft pushing to ssh://user@dummy/draft searching for changes - abort: push creates new remote head 84eaf32db6c3 + abort: push creates new remote head 84eaf32db6c3! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg log -G @ 5 default celeste draft CE | @@ -342,9 +342,9 @@ $ hg push ssh://user@dummy/main pushing to ssh://user@dummy/main searching for changes - abort: push creates new remote head 67f579af159d + abort: push creates new remote head 67f579af159d! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg log -G @ 5 default celeste draft CE | @@ -384,9 +384,9 @@ $ hg push draft pushing to $TESTTMP/draft (glob) searching for changes - abort: push creates new remote head f0bc62a661be on branch 'default:babar' + abort: push creates new remote head f0bc62a661be on branch 'default:babar'! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] Multiple heads on a branch merged into a topic branch ----------------------------------------------------- @@ -428,9 +428,9 @@ $ hg push draft -r . pushing to $TESTTMP/draft (glob) searching for changes - abort: push creates new remote head 4937c4cad39e + abort: push creates new remote head 4937c4cad39e! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] Reject when pushing to publishing
--- a/tests/test-topic-rebase.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-topic-rebase.t Tue Jul 12 19:02:08 2022 +0400 @@ -59,7 +59,7 @@ switching to topic myfeature 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg rebase - rebasing 1:39e7a938055e myfeature "add feature1" + rebasing 1:39e7a938055e "add feature1" (myfeature) switching to topic myfeature $ hg stack ### topic: myfeature @@ -110,12 +110,12 @@ switching to topic myotherfeature 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg rebase - rebasing 5:81f854012ec5 myotherfeature "myotherfeature1" + rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature) merging file warning: conflicts while merging file! (edit, then use 'hg resolve --mark') switching to topic myotherfeature unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') - [240] + [1] Resolve the conflict $ echo A2 > file @@ -124,7 +124,7 @@ (no more unresolved files) continue: hg rebase --continue $ hg rebase --continue - rebasing 5:81f854012ec5 myotherfeature "myotherfeature1" + rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature) Check the the commit has the right topic @@ -162,7 +162,7 @@ $ echo x > a.txt $ hg ci -Aqm x $ hg rebase -r . -d 3 --config rebase.experimental.inmemory=1 - rebasing 8:1323571d782d tip myotherfeature "x" + rebasing 8:1323571d782d "x" (tip myotherfeature) switching to topic myfeature switching to topic myotherfeature $ logtopic
--- a/tests/test-topic-stack-complex.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-topic-stack-complex.t Tue Jul 12 19:02:08 2022 +0400 @@ -160,7 +160,7 @@ 1 new orphan changesets 2 new content-divergent changesets $ hg rebase -r . -d ec94a1ed1330~1 - rebasing 9:eb3b16fef8ea tip foo "Added e and f" + rebasing 9:eb3b16fef8ea "Added e and f" (tip foo) $ hg stack ### topic: foo (2 heads) ### target: default (branch)
--- a/tests/test-topic-stack.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-topic-stack.t Tue Jul 12 19:02:08 2022 +0400 @@ -379,11 +379,11 @@ $ hg log -r 'stack(foo)' hg: parse error: stack takes no arguments, it works on current topic - [10] + [255] $ hg log -r 'stack(foobar)' hg: parse error: stack takes no arguments, it works on current topic - [10] + [255] Stack relation: @@ -410,8 +410,8 @@ Make things linear again $ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()' - rebasing 4:0f9ac936c87d foo "c_e" - rebasing 5:6559e6d93aea foo "c_f" + rebasing 4:0f9ac936c87d "c_e" (foo) + rebasing 5:6559e6d93aea "c_f" (foo) $ hg log -G o 8 default {foo} draft c_f | @@ -480,8 +480,8 @@ $ hg commit --amend -m 'c_D' 4 new orphan changesets $ hg rebase -d . -s 'desc(c_g)' - rebasing 9:81264ae8a36a foo "c_g" - rebasing 10:fde5f5941642 foo "c_h" + rebasing 9:81264ae8a36a "c_g" (foo) + rebasing 10:fde5f5941642 "c_h" (foo) $ hg log -G o 13 default {foo} draft c_h | @@ -546,8 +546,8 @@ Converting into a linear chain $ hg rebase -s 'desc("c_e") - obsolete()' -d 'desc("c_h") - obsolete()' - rebasing 7:215bc359096a foo "c_e" - rebasing 8:ec9267b3f33f foo "c_f" + rebasing 7:215bc359096a "c_e" (foo) + rebasing 8:ec9267b3f33f "c_f" (foo) $ hg log -G o 15 default {foo} draft c_f @@ -593,17 +593,17 @@ o 0 default {} public c_a $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()' - rebasing 15:77082e55de88 foo "c_f" + rebasing 15:77082e55de88 "c_f" (foo) switching to topic foo 1 new orphan changesets switching to topic foobar $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()' - rebasing 12:0c3e8aed985d foo "c_g" + rebasing 12:0c3e8aed985d "c_g" (foo) switching to topic foo - rebasing 13:b9e4f3709bc5 foo "c_h" - rebasing 16:4bc813530301 foobar "c_e" + rebasing 13:b9e4f3709bc5 "c_h" (foo) + rebasing 16:4bc813530301 "c_e" (foobar) switching to topic foobar - rebasing 18:4406ea4be852 tip foo "c_f" + rebasing 18:4406ea4be852 "c_f" (tip foo) switching to topic foo switching to topic foobar $ hg up @@ -905,12 +905,12 @@ get things linear again $ hg rebase -r s1 -d default - rebasing 16:1d84ec948370 tip blue "c_D" + rebasing 16:1d84ec948370 "c_D" (tip blue) switching to topic blue $ hg rebase -r s2 -d s1 - rebasing 13:3ab2eedae500 blue "c_G" + rebasing 13:3ab2eedae500 "c_G" (blue) $ hg rebase -r s3 -d s2 - rebasing 8:3bfe800e0486 blue "c_I" + rebasing 8:3bfe800e0486 "c_I" (blue) $ hg stack ### topic: blue ### target: default (branch)
--- a/tests/test-topic-tutorial.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-topic-tutorial.t Tue Jul 12 19:02:08 2022 +0400 @@ -488,10 +488,10 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg rebase - rebasing 1:13900241408b food "adding condiments" + rebasing 1:13900241408b "adding condiments" (food) merging shopping switching to topic food - rebasing 2:287de11b401f food "adding fruits" + rebasing 2:287de11b401f "adding fruits" (food) merging shopping $ hg log --graph @@ -1055,12 +1055,12 @@ #endif $ hg rebase - rebasing 6:183984ef46d1 tools "Adding hammer" + rebasing 6:183984ef46d1 "Adding hammer" (tools) merging shopping switching to topic tools - rebasing 7:cffff85af537 tools "Adding saw" + rebasing 7:cffff85af537 "Adding saw" (tools) merging shopping - rebasing 8:34255b455dac tools "Adding drill" + rebasing 8:34255b455dac "Adding drill" (tools) merging shopping But what about the other topic? You can use 'hg topics --verbose' to see @@ -1077,9 +1077,9 @@ $ hg push --rev drinks pushing to $TESTTMP/server (glob) searching for changes - abort: push creates new remote head 70dfa201ed73 + abort: push creates new remote head 70dfa201ed73! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] Even after a rebase, pushing all active topics at the same time would publish @@ -1087,19 +1087,19 @@ multiple *public* heads it would create on that branch: $ hg rebase -b drinks - rebasing 9:8dfa45bd5e0c drinks "Adding apple juice" + rebasing 9:8dfa45bd5e0c "Adding apple juice" (drinks) merging shopping switching to topic drinks - rebasing 10:70dfa201ed73 drinks "Adding orange juice" + rebasing 10:70dfa201ed73 "Adding orange juice" (drinks) merging shopping switching to topic tools $ hg push pushing to $TESTTMP/server (glob) searching for changes - abort: push creates new remote head 4cd7c1591a67 + abort: push creates new remote head 4cd7c1591a67! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] Publishing only one of them is allowed (as long as it does not create a new branch head as we just saw in the previous case): @@ -1777,9 +1777,9 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg rebase - rebasing 19:d5c51ee5762a tools "Adding saw" + rebasing 19:d5c51ee5762a "Adding saw" (tools) merging shopping - rebasing 20:bae3758e46bf tools "Adding drill" + rebasing 20:bae3758e46bf "Adding drill" (tools) merging shopping $ hg stack
--- a/tests/test-topic.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-topic.t Tue Jul 12 19:02:08 2022 +0400 @@ -266,16 +266,16 @@ $ hg topic '.' abort: the name '.' is reserved - [10] + [255] $ hg topic null abort: the name 'null' is reserved - [10] + [255] $ hg topic tip abort: the name 'tip' is reserved - [10] + [255] $ hg topic 12345 abort: cannot use an integer as a name - [10] + [255] $ hg topic ' ' abort: topic name cannot consist entirely of whitespaces [255] @@ -312,7 +312,7 @@ HG: branch 'default' HG: changed alpha abort: empty commit message - [10] + [255] $ hg revert alpha $ hg topic * topicflag (0 changesets) @@ -644,7 +644,7 @@ * query (1 changesets) $ hg pull ../pinky -r narf pulling from ../pinky - abort: unknown revision 'narf' + abort: unknown revision 'narf'! [255] $ hg pull ../pinky -r default pulling from ../pinky @@ -818,13 +818,13 @@ $ tlog 'topic(wdir())' 9: fran $ tlog 'topic(nonsense)' - abort: unknown revision 'nonsense' + abort: unknown revision 'nonsense'! [255] Pattern matching in topic() revset $ tlog 'topic("re:nonsense")' $ tlog 'topic("literal:nonsense")' - abort: topic 'nonsense' does not exist + abort: topic 'nonsense' does not exist! [255] Deactivate the topic.
--- a/tests/test-uncommit-interactive.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-uncommit-interactive.t Tue Jul 12 19:02:08 2022 +0400 @@ -45,7 +45,7 @@ (enter ? for help) [Ynesfdaq?] q abort: user quit - [250] + [255] $ hg status Make a commit with multiple hunks
--- a/tests/test-unstability-resolution-result.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-unstability-resolution-result.t Tue Jul 12 19:02:08 2022 +0400 @@ -90,7 +90,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg revert -r "orphan()" a $ hg diff diff -r 66719795a494 a @@ -102,7 +102,7 @@ +newer a $ hg evolve --continue abort: unresolved merge conflicts (see 'hg help resolve') - [20] + [255] $ hg resolve -m a (no more unresolved files) continue: hg evolve --continue
--- a/tests/test-userguide.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-userguide.t Tue Jul 12 19:02:08 2022 +0400 @@ -20,7 +20,7 @@ $ hg commit --amend -u alice -d '1 0' -m 'implement feature Y' saved backup bundle to $TESTTMP/t/.hg/strip-backup/6e725fd2be6f-42cc74d4-amend.hg (glob) $ hg log -r 23fe4ac6d3f1 - abort: unknown revision '23fe4ac6d3f1' + abort: unknown revision '23fe4ac6d3f1'! [255] $ hg identify -in fe0ecd3bd2a4 1 @@ -38,7 +38,7 @@ $ echo 'tweak feature Y' >> file1.c $ hg commit --amend -u alice -d '2 0' -m 'implement feature Y' $ hg shortlog -q -r fe0ecd3bd2a4 - abort: hidden revision 'fe0ecd3bd2a4' was rewritten as: 934359450037 + abort: hidden revision 'fe0ecd3bd2a4' was rewritten as: 934359450037! (use --hidden to access hidden revisions) [255] $ hg --hidden shortlog -G
--- a/tests/test-wireproto.t Tue Jul 12 18:49:14 2022 +0400 +++ b/tests/test-wireproto.t Tue Jul 12 19:02:08 2022 +0400 @@ -200,7 +200,7 @@ $ hg debugpushkey http://localhost:$HGPORT/ obsolete abort: HTTP Error 410: won't exchange obsmarkers through pushkey - [100] + [255] $ cat errors.log $ hg debugpushkey ssh://user@dummy/server obsolete remote: abort: won't exchange obsmarkers through pushkey