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-public-content-divergent-main.t
changeset 4633 61c2518cd6d2
parent 4625 a4fde4e3e763
child 4660 b62ed7c69561 
--- a/tests/test-evolve-public-content-divergent-main.t	Sat Apr 27 17:11:12 2019 +0800
+++ b/tests/test-evolve-public-content-divergent-main.t	Fri Apr 26 01:20:08 2019 +0530
@@ -73,8 +73,6 @@
   merge:[2] added b
   with: [3] updated b
   base: [1] added b
-  updating to "local" side of the conflict: 44f360db368f
-  merging "other" content-divergent changeset 'dcdaf152280a'
   merging b
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   committed as c1aa9cfb6cf8
@@ -169,8 +167,6 @@
   merge:[2] added b
   with: [3] updated b
   base: [1] added b
-  updating to "local" side of the conflict: 580f2d01e52c
-  merging "other" content-divergent changeset '0e805383168e'
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -271,8 +267,6 @@
   with: [5] added d e
   base: [3] added d
   rebasing "other" content-divergent changeset 4291d72ee19a on 155349b645be
-  updating to "local" side of the conflict: 93cd84bbdaca
-  merging "other" content-divergent changeset 'f88581407163'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   committed as 4cbe48a0c3d9
   working directory is now at 4cbe48a0c3d9
@@ -393,8 +387,6 @@
 
   $ hg evolve --continue
   evolving 4:f31bcc378766 "added d c e"
-  updating to "local" side of the conflict: 93cd84bbdaca
-  merging "other" content-divergent changeset 'bd28d3e4a228'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   committed as 412dde898967
   working directory is now at 412dde898967
@@ -491,8 +483,6 @@
   with: [4] added d
   base: [3] added d
   rebasing "other" content-divergent changeset 9411ad1fe615 on 155349b645be
-  updating to "local" side of the conflict: 93cd84bbdaca
-  merging "other" content-divergent changeset 'b5c690cdf1d5'
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -619,8 +609,6 @@
 
   $ hg evolve --continue
   evolving 4:3c17c7afaf6e "added c e"
-  updating to "local" side of the conflict: 93cd84bbdaca
-  merging "other" content-divergent changeset 'c4ce3d34e784'
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   2 files updated, 0 files merged, 0 files removed, 1 files unresolved
evolve