Mercurial > evolve
diff tests/test-evolve.t @ 5714:b3d9e6c805d6 stable
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
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 19 Nov 2020 08:28:45 -0800 |
| parents | b2de5825e5ca |
| children | 8c7de8f8bb42 ceaa85c47973 |
line wrap: on
line diff
--- a/tests/test-evolve.t Thu Jan 21 19:05:17 2021 +0800 +++ b/tests/test-evolve.t Thu Nov 19 08:28:45 2020 -0800 @@ -628,7 +628,7 @@ merging 1 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see hg help resolve) - [1] + [240] $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' 7:a5bfd90a2f29 $ echo 3 > 1 @@ -1394,7 +1394,7 @@ warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ glog -r "desc('add unstableifparentisfolded')::" --hidden @ 33:b9acdb1af6d5@default(draft) will be evolved safely