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-discard.t
changeset 4633 61c2518cd6d2
parent 4625 a4fde4e3e763
child 4660 b62ed7c69561 
--- a/tests/test-evolve-public-content-divergent-discard.t	Sat Apr 27 17:11:12 2019 +0800
+++ b/tests/test-evolve-public-content-divergent-discard.t	Fri Apr 26 01:20:08 2019 +0530
@@ -90,7 +90,6 @@
   merge:[4] added c
   with: [3] added ch
   base: [2] added c
-  merging "other" content-divergent changeset '90522bccf499'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   other divergent changeset 90522bccf499 has same content as local f7c1071f1e7c and differs by "description" only, discarding 90522bccf499
   content divergence resolution between f7c1071f1e7c (public) and 90522bccf499 has same content as f7c1071f1e7c, discarding 90522bccf499
@@ -183,8 +182,6 @@
   with: [4] added dh
   base: [3] added d
   rebasing "other" content-divergent changeset 5acd58ef5066 on 155349b645be
-  updating to "local" side of the conflict: e800202333a4
-  merging "other" content-divergent changeset 'ae3429430ef1'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   other divergent changeset ae3429430ef1 has same content as local e800202333a4 and differs by "description" only, discarding ae3429430ef1
   content divergence resolution between e800202333a4 (public) and ae3429430ef1 has same content as e800202333a4, discarding ae3429430ef1
@@ -269,7 +266,6 @@
   merge:[4] added c
   with: [3] added ch
   base: [2] added c
-  merging "other" content-divergent changeset '229da2719b19'
   merging ch
   warning: conflicts while merging ch! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -397,8 +393,6 @@
 
   $ hg evolve --continue
   evolving 4:f89a8e2f86ac "added dh"
-  updating to "local" side of the conflict: e800202333a4
-  merging "other" content-divergent changeset 'bc309da55b88'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   other divergent changeset bc309da55b88 has same content as local e800202333a4 and differs by "description" only, discarding bc309da55b88
   working directory is now at e800202333a4
@@ -491,8 +485,6 @@
   with: [4] added dh
   base: [3] added d
   rebasing "other" content-divergent changeset db0b7bba0aae on 155349b645be
-  updating to "local" side of the conflict: e800202333a4
-  merging "other" content-divergent changeset 'a5bbf2042450'
   merging dh
   warning: conflicts while merging dh! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -609,8 +601,6 @@
 
   $ hg evolve --continue
   evolving 4:67b19bbd770f "added dh"
-  updating to "local" side of the conflict: e800202333a4
-  merging "other" content-divergent changeset '09054d1f3c97'
   merging dh
   warning: conflicts while merging dh! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -697,8 +687,6 @@
   merge:[5] added d
   with: [6] closing feature branch
   base: [3] added d
-  updating to "local" side of the conflict: 497d0d2b90ba
-  merging "other" content-divergent changeset 'af442315d198'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   other divergent changeset af442315d198 is a closed branch head and differs from local 497d0d2b90ba by "branch, description" only, discarding af442315d198
   content divergence resolution between 497d0d2b90ba (public) and af442315d198 has same content as 497d0d2b90ba, discarding af442315d198
evolve