Mercurial > evolve

comparison tests/test-unstability-resolution-result.t @ 5357:e48fd82923f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: replace ls -A with hg status -A The latter provides more useful information and is not very expensive.
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 07 Jun 2020 18:08:14 +0800
parents baa0b481eec5
children 98e2613d797d
comparison
equal deleted inserted replaced
5356:0b9fcdcdc58f 5357:e48fd82923f1
64 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} 64 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
65 cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} 65 cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
66 66
67 Test evolve of orphan that run into conflict 67 Test evolve of orphan that run into conflict
68 68
69 $ ls -A 69 $ hg status -A
70 .hg 70 C a
71 a 71 C b
72 b
73 $ hg pdiff a 72 $ hg pdiff a
74 diff -r 07f494440405 a 73 diff -r 07f494440405 a
75 --- a/a Thu Jan 01 00:00:00 1970 +0000 74 --- a/a Thu Jan 01 00:00:00 1970 +0000
76 +++ b/a Thu Jan 01 00:00:00 1970 +0000 75 +++ b/a Thu Jan 01 00:00:00 1970 +0000
77 @@ -1,1 +1,2 @@ 76 @@ -1,1 +1,2 @@