This instance will be upgraded to Heptapod 0.23.2 on 2021-08-05 at 11:00 UTC+2 (a few minutes of down time)

Commit 90090636 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

tests: update with more detailed exit codes

CORE-TEST-OUTPUT-UPDATE: 21733e8c924f
CORE-TEST-OUTPUT-UPDATE: 8d72e29ad1e0
CORE-TEST-OUTPUT-UPDATE: e0dbfbd4062c
CORE-TEST-OUTPUT-UPDATE: ebee234d952a
CORE-TEST-OUTPUT-UPDATE: 527ce85c2e60
CORE-TEST-OUTPUT-UPDATE: 3175b0e0058b
CORE-TEST-OUTPUT-UPDATE: f96fa4de5055
CORE-TEST-OUTPUT-UPDATE: 96ca817ec192
parent dd9dba7c1d00
Pipeline #13367 failed with stage
in 4 minutes and 21 seconds
......@@ -666,7 +666,7 @@ Trying on a dirty working directory
$ hg add bar
$ HGEDITOR=cat hg amend --patch
abort: uncommitted changes
[255]
[20]
$ hg revert --all
forgetting bar
......
......@@ -56,7 +56,7 @@ Testing --abort when no evolve is interrupted
#else
$ hg abort
abort: no operation in progress
[255]
[20]
#endif
Testing with wrong combination of flags
......@@ -101,7 +101,7 @@ Normal testingw when no rev was evolved
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg parents
changeset: 5:e93a9161a274
......@@ -148,7 +148,7 @@ cleaning up things for next testing
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo foo > d
$ hg resolve -m
(no more unresolved files)
......@@ -176,7 +176,7 @@ When there are evolved revisions but on a single branch
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
testing that interrupted evolve shows up in morestatus
$ hg status -v
......@@ -288,7 +288,7 @@ Testing when evolved revs are on multiple branches
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg glog
o 9:7f8e8bd9f0b6 added c
......@@ -353,7 +353,7 @@ Testing when user created a new changesets on top of evolved revisions
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg glog
o 9:7f8e8bd9f0b6 added c
| () draft
......@@ -431,7 +431,7 @@ Testing when the evolved revision turned public due to some other user actions
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg glog
o 12:1c476940790a added d
......@@ -507,7 +507,7 @@ Testing that bookmark should be moved back when doing `hg evolve --abort`
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg glog
@ 5:c1f4718020e3 added b
......@@ -554,7 +554,7 @@ Testing `--abort` when conflicts are caused due to `hg next --evolve`
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg abort
evolve aborted
......
......@@ -97,7 +97,7 @@ Creating phase divergence, resolution of which will lead to conflicts
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
testing that interrupted evolve shows up in morestatus
$ hg status -v
......@@ -216,7 +216,7 @@ in conflicts
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg abort
1 new phase-divergent changesets
......@@ -286,7 +286,7 @@ after resolving one of them
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo watwat > c
$ hg resolve -m
......@@ -302,7 +302,7 @@ after resolving one of them
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg abort
1 new phase-divergent changesets
......
......@@ -344,7 +344,7 @@ When base has different message and both divergents has same one
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo foobar > d
$ hg resolve -m
......@@ -404,7 +404,7 @@ conflicts
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo watbar > d
$ hg resolve -m
......@@ -615,7 +615,7 @@ Check conflict during content-divergence resolution
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ cat > a <<EOF
> jungle
......
......@@ -90,7 +90,7 @@ Creating content divergence, resolution of which will lead to conflicts
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg status -v
M d
......@@ -204,7 +204,7 @@ conflicts and resolution of first one resulted in no new commit
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg evolve --abort
2 new orphan changesets
......@@ -312,7 +312,7 @@ is parent of one of the divergents and relocating leads to conflicts
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg evolve --abort
evolve aborted
......@@ -366,7 +366,7 @@ is parent of one of the divergents and merging divergent leads to conflicts
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg evolve --abort
evolve aborted
......@@ -458,7 +458,7 @@ Creating content divergence, resolution of which will lead to conflicts
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg evolve --stop
stopped the interrupted evolve
......@@ -511,7 +511,7 @@ merging
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg evolve --stop
stopped the interrupted evolve
......@@ -561,7 +561,7 @@ relocation
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg diff
diff -r ca1b80f7960a c
......
......@@ -310,7 +310,7 @@ will lead to conflicts
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo watbar > y
$ hg resolve -m
......@@ -464,7 +464,7 @@ Testing when the relocation will result in conflicts and merging also:
warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg diff
diff -r 7411ed2cf7cf y
......@@ -494,7 +494,7 @@ Testing when the relocation will result in conflicts and merging also:
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg diff
diff -r 635c0edd2e45 y
......
......@@ -272,7 +272,7 @@ add some changes on "other" side, to check later that merging performed correctl
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo c > c
$ hg res -m
(no more unresolved files)
......@@ -285,7 +285,7 @@ add some changes on "other" side, to check later that merging performed correctl
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg diff
diff -r 5907cbc074a0 c
--- a/c Thu Jan 01 00:00:00 1970 +0000
......@@ -542,7 +542,7 @@ Let's try to evolve stack
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo b > b
$ hg res -m
......@@ -555,7 +555,7 @@ Let's try to evolve stack
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo b > b
$ hg res -m
......@@ -644,7 +644,7 @@ Now let's try to evolve stack
4 new orphan changesets
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
As now we have interrupted evolution of stack of content-divergent cset (when
relocation of "divergent" also included) let's test --abort and --stop
......@@ -745,7 +745,7 @@ test --stop:
4 new orphan changesets
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg evolve --stop
2 new orphan changesets
......@@ -865,7 +865,7 @@ Again, let's evolve the stack
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo foo > b
$ hg res -m
......
......@@ -60,7 +60,7 @@ Simple case of evolve --continue
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo foo > d
$ hg resolve -m
......@@ -121,7 +121,7 @@ Case when conflicts resolution lead to empty wdir in evolve --continue
warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo bar > e
$ hg resolve -m
......@@ -162,7 +162,7 @@ Case when there are a lot of revision to continue
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo foo > b
$ hg resolve -m
......@@ -247,7 +247,7 @@ Test multiple conflicts in one evolve
warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo foo > f
$ hg resolve -m
......@@ -262,7 +262,7 @@ Test multiple conflicts in one evolve
warning: conflicts while merging h! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo foo > h
$ hg resolve -m
......@@ -309,7 +309,7 @@ Make sure, confirmopt is respected while continue
warning: conflicts while merging g! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo foo > g
$ hg resolve -m
......@@ -358,7 +358,7 @@ Testing `evolve --continue` after `hg next --evolve`
warning: conflicts while merging g! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo foo > g
$ hg resolve -m
(no more unresolved files)
......@@ -425,7 +425,7 @@ Testing that interrupted evolve don't get confused about copies (issue5930):
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
Status mentions file 'b' (copied from 'a') here, even though it wasn't
affected by the evolved changeset (nor was 'a')
......@@ -455,7 +455,7 @@ affected by the evolved changeset (nor was 'a')
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg st -C
M a
A d
......
......@@ -59,7 +59,7 @@ Amending revision 1 in a way that causes conflicts
atop:[4] apricot
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg evolve --list
34a690fcf6ab: banana
orphan: 7f59f18ca4a9 (obsolete parent)
......
......@@ -43,7 +43,7 @@ Trying to evolve, then manually discarding changes from revision 1
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo apricot > a
$ hg resolve --mark a
......
......@@ -210,7 +210,7 @@ Testing with first parent obsoleted
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo FOObar > c
$ hg resolve -m
......@@ -266,7 +266,7 @@ Testing a conlficting merge with second parent obsoleted
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo foobar > c
$ hg resolve -m
......
......@@ -860,7 +860,7 @@ Resolution using `hg evolve --phase-divergent`
warning: conflicts while merging x! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg diff
diff -r 8c2bb6fb44e9 l
......
......@@ -87,7 +87,7 @@ Testing case when there are conflicts (bug 5720)
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg diff
diff -r 87495ea7c9ec a
......
......@@ -136,7 +136,7 @@ Test progress with --continue
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo resolved > a
$ hg resolve -m a
(no more unresolved files)
......
......@@ -396,7 +396,7 @@ Change phase to public for one head:
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg diff
diff -r 155349b645be c
......@@ -427,7 +427,7 @@ Change phase to public for one head:
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg sum
parent: 5:93cd84bbdaca
......
......@@ -273,7 +273,7 @@ Testing when same parent, merging conflict:
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg diff
diff -r f7c1071f1e7c ch
......@@ -388,7 +388,7 @@ Testing when different parent, relocation conflict:
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo c > c
$ hg res -m
......@@ -494,7 +494,7 @@ Testing when different parent, merging conflict:
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo dh > dh
$ hg res -m
......@@ -598,7 +598,7 @@ Testing when different parent, conflict in relocation and merging:
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo c > c
$ hg res -m
......@@ -612,7 +612,7 @@ Testing when different parent, conflict in relocation and merging:
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo dh > dh
$ hg res -m
......
......@@ -174,7 +174,7 @@ Lets resolve the divergence:
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo "I am foobar" > b
$ hg resolve -m --tool union
......@@ -361,7 +361,7 @@ Change phase to public for one head:
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg diff
diff -r 155349b645be c
......@@ -492,7 +492,7 @@ Change phase to public for one head:
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo d > d
$ hg res -m
......@@ -585,7 +585,7 @@ Change phase to public for one head:
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg diff
diff -r 155349b645be c
......@@ -620,7 +620,7 @@ Change phase to public for one head:
2 files updated, 0 files merged, 0 files removed, 1 files unresolved
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo d > d
$ hg res -m
......
......@@ -59,5 +59,5 @@ Smoke testing
abort: remote error:
incompatible Mercurial client; bundle2 required
(see https://www.mercurial-scm.org/wiki/IncompatibleClient)
[255]
[100]
$ cat ../errors.log
......@@ -92,7 +92,7 @@ Testing when only one revision is to evolve
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg evolve --stop
stopped the interrupted evolve
......@@ -138,7 +138,7 @@ Testing the stop flag in case conflicts are caused by `hg next --evolve`
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg diff
diff -r cb6a2ab625bb d
......@@ -200,7 +200,7 @@ we do `evolve --stop`
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo foo > d
$ hg resolve -m
(no more unresolved files)
......@@ -250,7 +250,7 @@ we do `evolve --stop`
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg status
M c
......@@ -288,7 +288,7 @@ Making sure doing evolve again resumes from right place and does the right thing
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ echo foobar > c
$ hg resolve -m
......@@ -364,7 +364,7 @@ bookmarks of rest of them should stay where they are are
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]
$ hg evolve --stop
stopped the interrupted evolve
......
......@@ -86,7 +86,7 @@ Creating phase divergence, resolution of which will lead to conflicts
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
[1]
[240]