Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-content-divergence.t
changeset 4408 02ece0e5865e
parent 4407 7fd0cbf6190d
child 4422 62a6f8f4e694 
--- a/tests/test-evolve-content-divergence.t	Fri Feb 22 23:49:37 2019 +0530
+++ b/tests/test-evolve-content-divergence.t	Fri Feb 22 21:01:06 2019 +0530
@@ -693,26 +693,35 @@
 
   $ hg evolve --continue
   evolving 23:3f7a1f693080 "added z"
-  updating to "local" side of the conflict: 3f7a1f693080
+  updating to "local" side of the conflict: 53242575ffa9
   merging "other" content-divergent changeset 'cdb0643c69fc'
-  4 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 10c9f94f1e99
+  merging y
+  warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
+  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+  fix conflicts and see `hg help evolve.interrupted`
+  [1]
 
   $ hg diff
+  diff -r 53242575ffa9 y
+  --- a/y	Thu Jan 01 00:00:00 1970 +0000
+  +++ b/y	Thu Jan 01 00:00:00 1970 +0000
+  @@ -1,1 +1,5 @@
+  +<<<<<<< local: 53242575ffa9 bar - test: added z
+   watbar
+  +=======
+  +foo
+  +>>>>>>> other: cdb0643c69fc - test: added z
 
   $ echo foo > y
   $ hg resolve -m
-  abort: resolve command not applicable when not merging
-  [255]
+  (no more unresolved files)
+  continue: hg evolve --continue
   $ hg evolve --continue
-  abort: no interrupted evolve to continue
-  [255]
+  working directory is now at 6fc7d9682de6
 
   $ hg glog
-  @  27:10c9f94f1e99 added z
-  |   () [default] draft
-  | *  25:53242575ffa9 added z
-  |/    () [bar] draft
+  @  27:6fc7d9682de6 added z
+  |   () [bar] draft
   o  21:7bbcf24ddecf added y
   |   () [bar] draft
   o  15:b006cf317e0e added foo to x
@@ -733,21 +742,22 @@
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 10c9f94f1e9902d905b22019d711d31f3642f589
+  # Branch bar
+  # Node ID 6fc7d9682de6e3bee6c8b1266b756ed7d522b7e4
   # Parent  7bbcf24ddecfe97d7c2ac6fa8c07c155c8fda47b
   added z
   
-  diff -r 7bbcf24ddecf -r 10c9f94f1e99 y
+  diff -r 7bbcf24ddecf -r 6fc7d9682de6 y
   --- a/y	Thu Jan 01 00:00:00 1970 +0000
   +++ b/y	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -watbar
   +foo
-  diff -r 7bbcf24ddecf -r 10c9f94f1e99 z
+  diff -r 7bbcf24ddecf -r 6fc7d9682de6 z
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/z	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
-  +z
+  +bar
 
   $ cd ..
evolve