Mercurial > evolve

diff tests/test-evolve-content-divergent-relocation.t @ 5714:b3d9e6c805d6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 59b2be90e9fd
children 6dbfd71cdcba
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-relocation.t	Thu Jan 21 19:05:17 2021 +0800
+++ b/tests/test-evolve-content-divergent-relocation.t	Thu Nov 19 08:28:45 2020 -0800
@@ -310,7 +310,7 @@
   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 @@
   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 @@
   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