[PATCH 4 of 4 evolve-ext v4] evolve--list: divergence test for evolve --list

Kostia Balytskyi ikostia at fb.com
Sun Mar 20 18:11:47 EDT 2016


# HG changeset patch
# User Kostia Balytskyi <ikostia at fb.com>
# Date 1458511686 25200
#      Sun Mar 20 15:08:06 2016 -0700
# Node ID 6cad4935819f3aba2300ab33b8030da6dfff9fc2
# Parent  4a935e66bc4c1ec1b93b8d1f9284bcbd87395b96
evolve--list: divergence test for evolve --list

diff --git a/tests/test-evolve-list.t b/tests/test-evolve-list.t
--- a/tests/test-evolve-list.t
+++ b/tests/test-evolve-list.t
@@ -33,3 +33,36 @@ Test the bumpedness listing
   $ hg phase --public --rev 0 --hidden
   $ hg evolve --list
   $ cd ..
+
+Test the divergence listing
+  $ hg init r1
+  $ cd r1
+  $ echo a > a && hg ci -Am a
+  adding a
+  $ hg up 0
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ echo b > b && hg ci -Am b
+  adding b
+  $ hg up 0
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ echo c > c && hg ci -Am c
+  adding c
+  created new head
+  $ hg up 0
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ echo d > d && hg ci -Am d
+  adding d
+  created new head
+  $ hg rebase -s 1 -d 2
+  rebasing 1:d2ae7f538514 "b"
+  $ hg rebase -s 1 -d 3 --hidden
+  rebasing 1:d2ae7f538514 "b"
+  2 new divergent changesets
+  $ hg evolve --list
+  c882616e: b
+    divergent with:
+      (a922b373); common precursor: d2ae7f53
+  a922b373: b
+    divergent with:
+      (c882616e); common precursor: d2ae7f53
+  $ cd ..


More information about the Mercurial-devel mailing list