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-prune.t
changeset 1067 5d063fed9e3d
parent 1065 f355bbc124fc
child 1114 5d574b92203c 
--- a/tests/test-prune.t	Wed Aug 20 21:14:49 2014 -0700
+++ b/tests/test-prune.t	Wed Aug 20 20:49:48 2014 -0700
@@ -44,7 +44,7 @@
   (leaving bookmark BABAR)
   working directory now at 47d2a3944de8
   $ hg debugobsolete
-  9d206ffc875e1bc304590549be293be36821e66c 0 (Sat Dec 15 00:00:00 1979 +0000) {'p1': '47d2a3944de8b013de3be9578e8e344ea2e6c097', 'user': 'blah'}
+  9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'}
 
 prune leaving instability behind
 
@@ -52,8 +52,8 @@
   1 changesets pruned
   2 new unstable changesets
   $ hg debugobsolete
-  9d206ffc875e1bc304590549be293be36821e66c 0 (Sat Dec 15 00:00:00 1979 +0000) {'p1': '47d2a3944de8b013de3be9578e8e344ea2e6c097', 'user': 'blah'}
-  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 (*) {'p1': '1f0dee641bb7258c56bd60e93edfa2405381c41e', 'user': 'test'} (glob)
+  9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'}
+  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'user': 'test'} (glob)
 
 pruning multiple changeset at once
 
@@ -62,10 +62,10 @@
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   working directory now at 1f0dee641bb7
   $ hg debugobsolete
-  9d206ffc875e1bc304590549be293be36821e66c 0 (Sat Dec 15 00:00:00 1979 +0000) {'p1': '47d2a3944de8b013de3be9578e8e344ea2e6c097', 'user': 'blah'}
-  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 (*) {'p1': '1f0dee641bb7258c56bd60e93edfa2405381c41e', 'user': 'test'} (glob)
-  4538525df7e2b9f09423636c61ef63a4cb872a2d 0 (*) {'p1': '7c3bad9141dcb46ff89abf5f61856facd56e476c', 'user': 'test'} (glob)
-  47d2a3944de8b013de3be9578e8e344ea2e6c097 0 (*) {'p1': '4538525df7e2b9f09423636c61ef63a4cb872a2d', 'user': 'test'} (glob)
+  9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'}
+  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'user': 'test'} (glob)
+  4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'user': 'test'} (glob)
+  47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'user': 'test'} (glob)
 
 cannot prune public changesets
 
@@ -74,10 +74,10 @@
   (see "hg help phases" for details)
   [255]
   $ hg debugobsolete
-  9d206ffc875e1bc304590549be293be36821e66c 0 (Sat Dec 15 00:00:00 1979 +0000) {'p1': '47d2a3944de8b013de3be9578e8e344ea2e6c097', 'user': 'blah'}
-  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 (*) {'p1': '1f0dee641bb7258c56bd60e93edfa2405381c41e', 'user': 'test'} (glob)
-  4538525df7e2b9f09423636c61ef63a4cb872a2d 0 (*) {'p1': '7c3bad9141dcb46ff89abf5f61856facd56e476c', 'user': 'test'} (glob)
-  47d2a3944de8b013de3be9578e8e344ea2e6c097 0 (*) {'p1': '4538525df7e2b9f09423636c61ef63a4cb872a2d', 'user': 'test'} (glob)
+  9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'}
+  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'user': 'test'} (glob)
+  4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'user': 'test'} (glob)
+  47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'user': 'test'} (glob)
 
 Check successors addition
 ----------------------------
@@ -123,10 +123,10 @@
   4 files updated, 0 files merged, 4 files removed, 0 files unresolved
   working directory now at 6e8148413dd5
   $ hg debugobsolete
-  9d206ffc875e1bc304590549be293be36821e66c 0 (Sat Dec 15 00:00:00 1979 +0000) {'p1': '47d2a3944de8b013de3be9578e8e344ea2e6c097', 'user': 'blah'}
-  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 (*) {'p1': '1f0dee641bb7258c56bd60e93edfa2405381c41e', 'user': 'test'} (glob)
-  4538525df7e2b9f09423636c61ef63a4cb872a2d 0 (*) {'p1': '7c3bad9141dcb46ff89abf5f61856facd56e476c', 'user': 'test'} (glob)
-  47d2a3944de8b013de3be9578e8e344ea2e6c097 0 (*) {'p1': '4538525df7e2b9f09423636c61ef63a4cb872a2d', 'user': 'test'} (glob)
+  9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'}
+  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'user': 'test'} (glob)
+  4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'user': 'test'} (glob)
+  47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'user': 'test'} (glob)
   bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'user': 'test'} (glob)
   $ hg log -G
   @  12:6e8148413dd5[] (stable/draft) add nE
@@ -151,10 +151,10 @@
   $ hg prune 'desc("add dd")' -s 'desc("add nD")' -s 'desc("add nC")'
   1 changesets pruned
   $ hg debugobsolete
-  9d206ffc875e1bc304590549be293be36821e66c 0 (Sat Dec 15 00:00:00 1979 +0000) {'p1': '47d2a3944de8b013de3be9578e8e344ea2e6c097', 'user': 'blah'}
-  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 (*) {'p1': '1f0dee641bb7258c56bd60e93edfa2405381c41e', 'user': 'test'} (glob)
-  4538525df7e2b9f09423636c61ef63a4cb872a2d 0 (*) {'p1': '7c3bad9141dcb46ff89abf5f61856facd56e476c', 'user': 'test'} (glob)
-  47d2a3944de8b013de3be9578e8e344ea2e6c097 0 (*) {'p1': '4538525df7e2b9f09423636c61ef63a4cb872a2d', 'user': 'test'} (glob)
+  9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'}
+  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'user': 'test'} (glob)
+  4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'user': 'test'} (glob)
+  47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'user': 'test'} (glob)
   bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'user': 'test'} (glob)
   00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (*) {'user': 'test'} (glob)
   $ hg log -G
@@ -179,10 +179,10 @@
   abort: Can't use multiple successors for multiple precursors
   [255]
   $ hg debugobsolete
-  9d206ffc875e1bc304590549be293be36821e66c 0 (Sat Dec 15 00:00:00 1979 +0000) {'p1': '47d2a3944de8b013de3be9578e8e344ea2e6c097', 'user': 'blah'}
-  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 (*) {'p1': '1f0dee641bb7258c56bd60e93edfa2405381c41e', 'user': 'test'} (glob)
-  4538525df7e2b9f09423636c61ef63a4cb872a2d 0 (*) {'p1': '7c3bad9141dcb46ff89abf5f61856facd56e476c', 'user': 'test'} (glob)
-  47d2a3944de8b013de3be9578e8e344ea2e6c097 0 (*) {'p1': '4538525df7e2b9f09423636c61ef63a4cb872a2d', 'user': 'test'} (glob)
+  9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'}
+  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'user': 'test'} (glob)
+  4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'user': 'test'} (glob)
+  47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'user': 'test'} (glob)
   bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'user': 'test'} (glob)
   00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (*) {'user': 'test'} (glob)
 
@@ -191,10 +191,10 @@
   $ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nB")'
   2 changesets pruned
   $ hg debugobsolete
-  9d206ffc875e1bc304590549be293be36821e66c 0 (Sat Dec 15 00:00:00 1979 +0000) {'p1': '47d2a3944de8b013de3be9578e8e344ea2e6c097', 'user': 'blah'}
-  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 (*) {'p1': '1f0dee641bb7258c56bd60e93edfa2405381c41e', 'user': 'test'} (glob)
-  4538525df7e2b9f09423636c61ef63a4cb872a2d 0 (*) {'p1': '7c3bad9141dcb46ff89abf5f61856facd56e476c', 'user': 'test'} (glob)
-  47d2a3944de8b013de3be9578e8e344ea2e6c097 0 (*) {'p1': '4538525df7e2b9f09423636c61ef63a4cb872a2d', 'user': 'test'} (glob)
+  9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'}
+  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'user': 'test'} (glob)
+  4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'user': 'test'} (glob)
+  47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'user': 'test'} (glob)
   bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'user': 'test'} (glob)
   00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (*) {'user': 'test'} (glob)
   814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (*) {'user': 'test'} (glob)
@@ -213,10 +213,10 @@
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   working directory now at 1f0dee641bb7
   $ hg debugobsolete
-  9d206ffc875e1bc304590549be293be36821e66c 0 (Sat Dec 15 00:00:00 1979 +0000) {'p1': '47d2a3944de8b013de3be9578e8e344ea2e6c097', 'user': 'blah'}
-  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 (*) {'p1': '1f0dee641bb7258c56bd60e93edfa2405381c41e', 'user': 'test'} (glob)
-  4538525df7e2b9f09423636c61ef63a4cb872a2d 0 (*) {'p1': '7c3bad9141dcb46ff89abf5f61856facd56e476c', 'user': 'test'} (glob)
-  47d2a3944de8b013de3be9578e8e344ea2e6c097 0 (*) {'p1': '4538525df7e2b9f09423636c61ef63a4cb872a2d', 'user': 'test'} (glob)
+  9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'}
+  7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'user': 'test'} (glob)
+  4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'user': 'test'} (glob)
+  47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'user': 'test'} (glob)
   bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'user': 'test'} (glob)
   00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (*) {'user': 'test'} (glob)
   814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (*) {'user': 'test'} (glob)
@@ -276,7 +276,6 @@
   average meta length:               (27|71) (re)
       available  keys:
                  date:                4
-                   p1:                [04] (re)
                  user:                4
   disconnected clusters:              4
           any known node:             4
@@ -284,9 +283,9 @@
           longer length:              1
           median length:              1
           mean length:                1
-      using parents data:             [42] (re)
+      using parents data:             4
           any known node:             4
           smallest length:            1
-          longer length:              [13] (re)
-          median length:              [13] (re)
-          mean length:                [12] (re)
+          longer length:              1
+          median length:              1
+          mean length:                1
evolve