Mercurial > evolve

diff tests/test-topic-stack-complex.t @ 4190:883e75e0a810 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
topicidx: stop assigning index number to obsolete changesets Obsolete changeset are no longer part of the stack, the old logic tried to assigns them the index of their successors but this is flacky and error prone. So we stop doing so.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 17 Oct 2018 14:47:38 +0200
parents 36d559ca5332
children 2a7f89817540 470ba668687a
line wrap: on
line diff
--- a/tests/test-topic-stack-complex.t	Thu Oct 25 11:32:43 2018 +0200
+++ b/tests/test-topic-stack-complex.t	Wed Oct 17 14:47:38 2018 +0200
@@ -168,3 +168,12 @@
   s2: split1
   s1: Added a and b
   s0^ Added foo (base)
+
+  $ hg evolve --content-divergent -r ec94a1ed1330
+  merge:[s5] Added e and f
+  with: [s4] Added e and f
+  base: [s] Added e and f
+  updating to "local" side of the conflict: ec94a1ed1330
+  merging "other" content-divergent changeset 'f2eff98490d2'
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  working directory is now at 8faad6276dc6