--- a/tests/test-amend.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-amend.t Wed Mar 21 16:32:54 2018 +0100
@@ -28,7 +28,7 @@
@ 6a022cbb61d5 (2) adda
|
x 07f494440405 (0) adda
- rewritten(branch) as 6a022cbb61d5 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(branch) as 6a022cbb61d5 by test (*) (glob)
$ hg branch
foo
--- a/tests/test-discovery-obshashrange.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-discovery-obshashrange.t Wed Mar 21 16:32:54 2018 +0100
@@ -37,6 +37,20 @@
* @0000000000000000000000000000000000000000 (*)> debugbuilddag ".+7" (glob) (windows !)
* @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
* @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
+ * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
+ * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
+ * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
+ * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
+ * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
+ * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
+ * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
+ * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
+ * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
+ * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
+ * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
+ * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
+ * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
+ * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
* @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (8r, 0o) (glob)
* @0000000000000000000000000000000000000000 (*)> debugbuilddag .+7 exited 0 after *.?? seconds (glob) (no-windows !)
* @0000000000000000000000000000000000000000 (*)> debugbuilddag ".+7" exited 0 after *.?? seconds (glob) (windows !)
@@ -66,11 +80,11 @@
$ hg debugobsolete dddddddddddddddddddddddddddddddddddddddd `getid 'desc(r5)'` --config experimental.obshashrange.warm-cache=0
$ hg debugobsolete eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee `getid 'desc(r7)'`
$ hg debugobsolete
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 4de32a90b66cd083ebf3c00b41277aa7abca51dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (*) {'user': 'test'} (glob)
+ cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (*) {'user': 'test'} (glob)
+ dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 0 (*) {'user': 'test'} (glob)
+ eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 4de32a90b66cd083ebf3c00b41277aa7abca51dd 0 (*) {'user': 'test'} (glob)
$ hg blackbox
* @0000000000000000000000000000000000000000 (*)> log -G (glob)
@@ -145,23 +159,23 @@
* @0000000000000000000000000000000000000000 (*)> blackbox (glob)
$ rm ../server/.hg/blackbox.log
$ hg -R ../server/ debugobsolete --rev ::4 | sort
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (*) {'user': 'test'} (glob)
+ cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (*) {'user': 'test'} (glob)
$ rm ../server/.hg/blackbox.log
$ hg blackbox
* @0000000000000000000000000000000000000000 (*)> pull --rev 4 (glob)
- * @0000000000000000000000000000000000000000 (*)> updated base branch cache in *.???? seconds (glob)
- * @0000000000000000000000000000000000000000 (*)> wrote base branch cache with 1 labels and 1 nodes (glob)
+ * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
+ * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
* @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (5r, 3o) (glob)
* @0000000000000000000000000000000000000000 (*)> 5 incoming changes - new heads: bebd167eb94d (glob)
* @0000000000000000000000000000000000000000 (*)> pull --rev 4 exited 0 after *.?? seconds (glob)
* @0000000000000000000000000000000000000000 (*)> blackbox (glob)
$ rm .hg/blackbox.log
$ hg debugobsolete | sort
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (*) {'user': 'test'} (glob)
+ cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (*) {'user': 'test'} (glob)
testing simple push
===================
@@ -189,7 +203,7 @@
taking quick initial sample
query 2; still undecided: 5, sample size is: 5
sending known command
- 2 total queries in *.????s (glob)
+ 2 total queries
preparing listkeys for "phases"
sending listkeys command
received listkey for "phases": 58 bytes
@@ -221,7 +235,7 @@
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files (+1 heads)
remote: 1 new obsolescence markers
- bundle2-input-bundle: no-transaction
+ bundle2-input-bundle: with-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported
bundle2-input-part: "reply:obsmarkers" (params: 0 advisory) supported
@@ -235,17 +249,17 @@
* @0000000000000000000000000000000000000000 (*)> strip detected, evo-ext-depthcache cache reset (glob)
* @0000000000000000000000000000000000000000 (*)> updated evo-ext-depthcache in *.???? seconds (8r) (glob)
* @0000000000000000000000000000000000000000 (*)> updated evo-ext-stablerange-mergepoint in *.???? seconds (8r) (glob)
+ * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (1r, 0o) (glob)
+ * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
+ * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 2 nodes (glob)
* @0000000000000000000000000000000000000000 (*)> updated evo-ext-depthcache in *.???? seconds (1r) (glob)
- * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (1r, 1o) (glob)
- * @0000000000000000000000000000000000000000 (*)> updated evo-ext-stablerange-mergepoint in *.???? seconds (1r) (glob)
* @0000000000000000000000000000000000000000 (*)> strip detected, evo-ext-firstmerge cache reset (glob)
* @0000000000000000000000000000000000000000 (*)> updated evo-ext-firstmerge in *.???? seconds (9r) (glob)
* @0000000000000000000000000000000000000000 (*)> strip detected, evo-ext-stablesort cache reset (glob)
* @0000000000000000000000000000000000000000 (*)> updated evo-ext-stablesort in *.???? seconds (9r) (glob)
- * @0000000000000000000000000000000000000000 (*)> obscache is out of date, falling back to slower obsstore version (glob)
- * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
- * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 2 nodes (glob)
- * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (1r, 1o) (glob)
+ * @0000000000000000000000000000000000000000 (*)> updated evo-ext-stablerange-mergepoint in *.???? seconds (1r) (glob)
+ * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (1r, 1o) (glob)
+ * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
* @0000000000000000000000000000000000000000 (*)> 1 incoming changes - new heads: 45f8b879de92 (glob)
* @0000000000000000000000000000000000000000 (*)> -R server serve --stdio exited 0 after *.?? seconds (glob)
* @0000000000000000000000000000000000000000 (*)> blackbox (glob)
@@ -280,19 +294,17 @@
[1]
$ hg -R ../server blackbox
* @0000000000000000000000000000000000000000 (*)> serve --stdio (glob)
- * @0000000000000000000000000000000000000000 (*)> obshashcache clean - new markers affect 2 changeset and cached ranges (glob)
- * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (0r, 2o) (glob)
* @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 2o) (glob)
* @0000000000000000000000000000000000000000 (*)> -R server serve --stdio exited 0 after *.?? seconds (glob)
* @0000000000000000000000000000000000000000 (*)> blackbox (glob)
$ rm ../server/.hg/blackbox.log
$ hg -R ../server/ debugobsolete --rev ::tip | sort
- 111111111111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 22222222222222222bbbbbbbbbbbbb2222222222 2dc09a01254db841290af0538aa52f6f52c776e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- ffffffffffffffffffffffffffffffffffffffff 45f8b879de922f6a6e620ba04205730335b6fc7e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 111111111111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+ 22222222222222222bbbbbbbbbbbbb2222222222 2dc09a01254db841290af0538aa52f6f52c776e3 0 (*) {'user': 'test'} (glob)
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (*) {'user': 'test'} (glob)
+ cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (*) {'user': 'test'} (glob)
+ ffffffffffffffffffffffffffffffffffffffff 45f8b879de922f6a6e620ba04205730335b6fc7e 0 (*) {'user': 'test'} (glob)
$ hg blackbox
* @0000000000000000000000000000000000000000 (*)> debugobsolete (glob)
* @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
@@ -302,17 +314,15 @@
* @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> add foo (glob)
* @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> add foo exited 0 after *.?? seconds (glob)
* @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> commit -m foo (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obscache is out of date, falling back to slower obsstore version (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated served branch cache in *.???? seconds (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (1r, 0o) (glob)
+ * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obscache in *.???? seconds (1r, 0o) (glob)
+ * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated served branch cache in *.???? seconds (glob)
+ * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> commit -m foo exited 0 after *.?? seconds (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete ffffffffffffffffffffffffffffffffffffffff 45f8b879de922f6a6e620ba04205730335b6fc7e (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete ffffffffffffffffffffffffffffffffffffffff 45f8b879de922f6a6e620ba04205730335b6fc7e exited 0 after *.?? seconds (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> push -f --debug (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> found 1 common and 1 unknown server heads, 2 roundtrips in *.????s (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-stablerange-mergepoint cache reset (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-depthcache cache reset (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-depthcache in *.???? seconds (6r) (glob)
@@ -339,16 +349,16 @@
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obshashcache clean - new markers affect 2 changeset and cached ranges (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obshashrange in *.???? seconds (0r, 2o) (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obsdiscovery, 2/6 mismatch - 1 obshashrange queries in *.???? seconds (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> push exited 1 after *.?? seconds (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> push exited True after *.?? seconds (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> blackbox (glob)
$ rm .hg/blackbox.log
$ hg debugobsolete | sort
- 111111111111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 22222222222222222bbbbbbbbbbbbb2222222222 2dc09a01254db841290af0538aa52f6f52c776e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- ffffffffffffffffffffffffffffffffffffffff 45f8b879de922f6a6e620ba04205730335b6fc7e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 111111111111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+ 22222222222222222bbbbbbbbbbbbb2222222222 2dc09a01254db841290af0538aa52f6f52c776e3 0 (*) {'user': 'test'} (glob)
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (*) {'user': 'test'} (glob)
+ cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (*) {'user': 'test'} (glob)
+ ffffffffffffffffffffffffffffffffffffffff 45f8b879de922f6a6e620ba04205730335b6fc7e 0 (*) {'user': 'test'} (glob)
testing pull with extra remote markers
=====================================
@@ -394,20 +404,20 @@
* @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
* @0000000000000000000000000000000000000000 (*)> -R ../server debugobsolete bbbbbbb2222222222bbbbbbbbbbbbb2222222222 bebd167eb94d257ace0e814aeb98e6972ed2970d exited 0 after *.?? seconds (glob)
* @0000000000000000000000000000000000000000 (*)> serve --stdio (glob)
- * @0000000000000000000000000000000000000000 (*)> obshashcache clean - new markers affect 2 changeset and cached ranges (glob)
- * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (0r, 2o) (glob)
+ * @0000000000000000000000000000000000000000 (*)> obshashcache clean - new markers affect 3 changeset and cached ranges (glob)
+ * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (0r, 4o) (glob)
* @0000000000000000000000000000000000000000 (*)> -R server serve --stdio exited 0 after *.?? seconds (glob)
* @0000000000000000000000000000000000000000 (*)> blackbox (glob)
$ rm ../server/.hg/blackbox.log
$ hg -R ../server/ debugobsolete --rev '::6' | sort
- 111111111111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 22222222222222222bbbbbbbbbbbbb2222222222 2dc09a01254db841290af0538aa52f6f52c776e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- aaaaaaa11111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- bbbbbbb2222222222bbbbbbbbbbbbb2222222222 bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 111111111111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+ 22222222222222222bbbbbbbbbbbbb2222222222 2dc09a01254db841290af0538aa52f6f52c776e3 0 (*) {'user': 'test'} (glob)
+ aaaaaaa11111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+ bbbbbbb2222222222bbbbbbbbbbbbb2222222222 bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (*) {'user': 'test'} (glob)
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (*) {'user': 'test'} (glob)
+ cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (*) {'user': 'test'} (glob)
+ dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 0 (*) {'user': 'test'} (glob)
$ hg blackbox
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
@@ -420,22 +430,23 @@
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-depthcache in *.???? seconds (6r) (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-stablerange-mergepoint in *.???? seconds (6r) (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obsdiscovery, 2/6 mismatch - 1 obshashrange queries in *.???? seconds (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (2r, 0o) (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated served branch cache in *.???? seconds (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> wrote served branch cache with 1 labels and 2 nodes (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (2r, 3o) (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (0r, 3o) (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> 2 incoming changes - new heads: f69452c5b1af (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> pull -r 6 exited 0 after *.?? seconds (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> blackbox (glob)
$ rm .hg/blackbox.log
$ hg debugobsolete --rev '::6' | sort
- 111111111111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 22222222222222222bbbbbbbbbbbbb2222222222 2dc09a01254db841290af0538aa52f6f52c776e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- aaaaaaa11111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- bbbbbbb2222222222bbbbbbbbbbbbb2222222222 bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 111111111111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+ 22222222222222222bbbbbbbbbbbbb2222222222 2dc09a01254db841290af0538aa52f6f52c776e3 0 (*) {'user': 'test'} (glob)
+ aaaaaaa11111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+ bbbbbbb2222222222bbbbbbbbbbbbb2222222222 bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (*) {'user': 'test'} (glob)
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (*) {'user': 'test'} (glob)
+ cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (*) {'user': 'test'} (glob)
+ dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 0 (*) {'user': 'test'} (glob)
Test cache behavior
===================
@@ -596,24 +607,15 @@
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-depthcache in *.???? seconds (8r) (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-stablerange-mergepoint in *.???? seconds (8r) (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obsdiscovery, 0/8 mismatch - 1 obshashrange queries in *.???? seconds (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (1r, 0o) (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated served branch cache in *.???? seconds (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> wrote served branch cache with 1 labels and 2 nodes (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (1r, 1o) (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> 1 incoming changes - new heads: 4de32a90b66c (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> pull exited 0 after *.?? seconds (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> rollback (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-stablerange-mergepoint cache reset (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-depthcache cache reset (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-depthcache in *.???? seconds (8r) (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-stablerange-mergepoint in *.???? seconds (8r) (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-firstmerge cache reset (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-firstmerge in *.???? seconds (8r) (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-stablesort cache reset (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-stablesort in *.???? seconds (8r) (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated base branch cache in *.???? seconds (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> wrote base branch cache with 1 labels and 2 nodes (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-obscache cache reset (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (8r, 12o) (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> rollback exited 0 after *.?? seconds (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> blackbox (glob)
$ rm .hg/blackbox.log
@@ -646,13 +648,21 @@
1 new obsolescence markers
(run 'hg update' to get a working copy)
$ hg blackbox
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' (glob) (no-windows !)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev "heads(all())" (glob) (windows !)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' exited 0 after *.?? seconds (glob) (no-windows !)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev "heads(all())" exited 0 after *.?? seconds (glob) (windows !)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-stablerange-mergepoint cache reset (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-depthcache cache reset (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-depthcache in *.???? seconds (8r) (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-stablerange-mergepoint in *.???? seconds (8r) (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' exited 0 after *.?? seconds (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> pull (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-stablerange-mergepoint cache reset (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-depthcache cache reset (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-depthcache in *.???? seconds (8r) (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-stablerange-mergepoint in *.???? seconds (8r) (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obsdiscovery, 0/8 mismatch - 1 obshashrange queries in *.???? seconds (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (1r, 1o) (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-obscache cache reset (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (9r, 12o) (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> 1 incoming changes - new heads: 4de32a90b66c (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> pull exited 0 after *.?? seconds (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> blackbox (glob)
@@ -726,12 +736,10 @@
pulling from ssh://user@dummy/server
searching for changes
OBSEXC: looking for common markers in 8 nodes
- OBSEXC: request obsmarkers for 1 common nodes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- 2 new obsolescence markers
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg log -G
o 8 45f8b879de92 foo tip
@@ -756,8 +764,10 @@
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' (glob) (no-windows !)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev "heads(all())" (glob) (windows !)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> writing .hg/cache/tags2-visible with 0 tags (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-depthcache in *.???? seconds (1r) (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-stablerange-mergepoint in *.???? seconds (1r) (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-stablerange-mergepoint cache reset (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-depthcache cache reset (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-depthcache in *.???? seconds (9r) (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-stablerange-mergepoint in *.???? seconds (9r) (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obshashrange in *.???? seconds (1r, 1o) (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' exited 0 after *.?? seconds (glob) (no-windows !)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev "heads(all())" exited 0 after *.?? seconds (glob) (windows !)
@@ -766,18 +776,8 @@
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip -r 'desc("foo")' (glob)
* @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> saved backup bundle to $TESTTMP/client/.hg/strip-backup/45f8b879de92-94c82517-backup.hg (glob)
* @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> strip detected, evo-ext-obscache cache reset (glob)
- * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obscache in *.???? seconds (5r, 11o) (glob)
+ * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obscache in *.???? seconds (5r, 13o) (glob)
* @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obscache in *.???? seconds (3r, 0o) (glob)
- * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> strip detected, evo-ext-obshashrange cache reset (glob)
- * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> strip detected, evo-ext-depthcache cache reset (glob)
- * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-depthcache in *.???? seconds (8r) (glob)
- * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> strip detected, evo-ext-stablerange-mergepoint cache reset (glob)
- * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-stablerange-mergepoint in *.???? seconds (8r) (glob)
- * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obshashrange in *.???? seconds (8r, 11o) (glob)
- * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> strip detected, evo-ext-firstmerge cache reset (glob)
- * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-firstmerge in *.???? seconds (8r) (glob)
- * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> strip detected, evo-ext-stablesort cache reset (glob)
- * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-stablesort in *.???? seconds (8r) (glob)
* @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated base branch cache in *.???? seconds (glob)
* @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> wrote base branch cache with 1 labels and 1 nodes (glob)
* @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> 3 incoming changes - new heads: 4de32a90b66c (glob)
@@ -787,10 +787,16 @@
* @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> writing .hg/cache/tags2-visible with 0 tags (glob)
* @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> log -G exited 0 after *.?? seconds (glob)
* @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> pull (glob)
- * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> obsdiscovery, 1/8 mismatch - 1 obshashrange queries in *.???? seconds (glob)
- * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated base branch cache in *.???? seconds (glob)
- * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> wrote base branch cache with 1 labels and 2 nodes (glob)
- * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obscache in *.???? seconds (1r, 2o) (glob)
+ * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> strip detected, evo-ext-stablerange-mergepoint cache reset (glob)
+ * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> strip detected, evo-ext-depthcache cache reset (glob)
+ * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-depthcache in *.???? seconds (8r) (glob)
+ * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-stablerange-mergepoint in *.???? seconds (8r) (glob)
+ * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> strip detected, evo-ext-obshashrange cache reset (glob)
+ * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obshashrange in *.???? seconds (8r, 13o) (glob)
+ * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> obsdiscovery, 0/8 mismatch - 1 obshashrange queries in *.???? seconds (glob)
+ * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obscache in *.???? seconds (1r, 0o) (glob)
+ * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated served branch cache in *.???? seconds (glob)
+ * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> wrote served branch cache with 1 labels and 2 nodes (glob)
* @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> 1 incoming changes - new heads: 45f8b879de92 (glob)
* @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> pull exited 0 after *.?? seconds (glob)
* @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> log -G (glob)
--- a/tests/test-drop.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-drop.t Wed Mar 21 16:32:54 2018 +0100
@@ -1,6 +1,7 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
+ > hgext.graphlog=
> EOF
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
$ echo "drophack=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/hack/drophack.py" >> $HGRCPATH
@@ -206,13 +207,11 @@
| x changeset: 3:87ea30a976fd
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: pruned
| | summary: temporary amend commit for 34b6c051bf1f
| |
| x changeset: 2:34b6c051bf1f
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: amended as a2c06c884bfe
| summary: add child
|
o changeset: 1:19509a42b0d0
@@ -226,7 +225,7 @@
summary: add base
============ obsmark ============
- 34b6c051bf1f78db6aef400776de5cb964470207 a2c06c884bfe53d3840026248bd8a7eafa152df8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'}
+ 34b6c051bf1f78db6aef400776de5cb964470207 a2c06c884bfe53d3840026248bd8a7eafa152df8 0 (*) {'ef1': '*', 'user': 'test'} (glob)
87ea30a976fdf235bf096f04899cb02a903873e2 0 {34b6c051bf1f78db6aef400776de5cb964470207} (*) {'ef1': '*', 'user': 'test'} (glob)
$ hg drop .
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -264,3 +263,4 @@
summary: add base
============ obsmark ============
+ 87ea30a976fdf235bf096f04899cb02a903873e2 0 {34b6c051bf1f78db6aef400776de5cb964470207} (*) {'ef1': '0', 'user': 'test'} (glob)
--- a/tests/test-evolve-cycles.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-evolve-cycles.t Wed Mar 21 16:32:54 2018 +0100
@@ -62,19 +62,16 @@
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten as 2a34000d3544
| summary: C
|
x changeset: 2:c473644ee0e9
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten as a8df460dbbfe
| summary: B
|
@ changeset: 1:2a34000d3544
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten as c473644ee0e9
| summary: A
|
o changeset: 0:ea207398892e
@@ -89,48 +86,48 @@
$ hg obslog "desc(A)" --hidden
@ 2a34000d3544 (1) A
- | rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as c473644ee0e9 by test (*) (glob)
|
x a8df460dbbfe (3) C
- | rewritten as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as 2a34000d3544 by test (*) (glob)
|
x c473644ee0e9 (2) B
- | rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as a8df460dbbfe by test (*) (glob)
|
$ hg obslog "desc(B)" --hidden
@ 2a34000d3544 (1) A
- | rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as c473644ee0e9 by test (*) (glob)
|
x a8df460dbbfe (3) C
- | rewritten as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as 2a34000d3544 by test (*) (glob)
|
x c473644ee0e9 (2) B
- | rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as a8df460dbbfe by test (*) (glob)
|
$ hg obslog "desc(C)" --hidden
@ 2a34000d3544 (1) A
- | rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as c473644ee0e9 by test (*) (glob)
|
x a8df460dbbfe (3) C
- | rewritten as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as 2a34000d3544 by test (*) (glob)
|
x c473644ee0e9 (2) B
- | rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as a8df460dbbfe by test (*) (glob)
|
Check that all option don't crash on a cycle either
$ hg obslog "desc(C)" --hidden --all
@ 2a34000d3544 (1) A
- | rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as c473644ee0e9 by test (*) (glob)
|
x a8df460dbbfe (3) C
- | rewritten as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as 2a34000d3544 by test (*) (glob)
|
x c473644ee0e9 (2) B
- | rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as a8df460dbbfe by test (*) (glob)
|
Test with multiple cyles
@@ -207,37 +204,31 @@
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten as 868d2e0eb19c
| summary: F
|
x changeset: 5:0da815c333f6
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten as d9f908fde1a1
| summary: E
|
@ changeset: 4:868d2e0eb19c
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten as 0da815c333f6
| summary: D
|
x changeset: 3:a8df460dbbfe
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: split as 2a34000d3544, 868d2e0eb19c
| summary: C
|
x changeset: 2:c473644ee0e9
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten as a8df460dbbfe
| summary: B
|
x changeset: 1:2a34000d3544
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten as c473644ee0e9
| summary: A
|
o changeset: 0:ea207398892e
@@ -252,42 +243,42 @@
$ hg obslog "desc(D)" --hidden
x 0da815c333f6 (5) E
- | rewritten as d9f908fde1a1 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as d9f908fde1a1 by test (*) (glob)
|
@ 868d2e0eb19c (4) D
- |\ rewritten as 0da815c333f6 by test (Thu Jan 01 00:00:00 1970 +0000)
+ |\ rewritten(description, parent, content) as 0da815c333f6 by test (*) (glob)
| |
| x d9f908fde1a1 (6) F
- | | rewritten as 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rewritten(description, parent, content) as 868d2e0eb19c by test (*) (glob)
| |
+---x 2a34000d3544 (1) A
- | | rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rewritten(description, parent, content) as c473644ee0e9 by test (*) (glob)
| |
x | a8df460dbbfe (3) C
- | | rewritten as 2a34000d3544, 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rewritten(description, parent, content) as 2a34000d3544, 868d2e0eb19c by test (*) (glob)
| |
x | c473644ee0e9 (2) B
- | | rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rewritten(description, parent, content) as a8df460dbbfe by test (*) (glob)
| |
Check that all option don't crash either on a cycle
$ hg obslog --all --hidden "desc(F)"
x 0da815c333f6 (5) E
- | rewritten as d9f908fde1a1 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as d9f908fde1a1 by test (*) (glob)
|
@ 868d2e0eb19c (4) D
- |\ rewritten as 0da815c333f6 by test (Thu Jan 01 00:00:00 1970 +0000)
+ |\ rewritten(description, parent, content) as 0da815c333f6 by test (*) (glob)
| |
| x d9f908fde1a1 (6) F
- | | rewritten as 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rewritten(description, parent, content) as 868d2e0eb19c by test (*) (glob)
| |
+---x 2a34000d3544 (1) A
- | | rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rewritten(description, parent, content) as c473644ee0e9 by test (*) (glob)
| |
x | a8df460dbbfe (3) C
- | | rewritten as 2a34000d3544, 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rewritten(description, parent, content) as 2a34000d3544, 868d2e0eb19c by test (*) (glob)
| |
x | c473644ee0e9 (2) B
- | | rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rewritten(description, parent, content) as a8df460dbbfe by test (*) (glob)
| |
Check the json output is valid in this case
@@ -300,6 +291,11 @@
*, (glob)
0
],
+ "effect": [
+ *, (glob)
+ *, (glob)
+ "content"
+ ],
"succnodes": [
"0da815c333f6"
],
@@ -318,6 +314,11 @@
*, (glob)
0
],
+ "effect": [
+ *, (glob)
+ *, (glob)
+ "content"
+ ],
"succnodes": [
"868d2e0eb19c"
],
@@ -336,6 +337,11 @@
*, (glob)
0
],
+ "effect": [
+ "description",
+ "parent",
+ "content"
+ ],
"succnodes": [
"d9f908fde1a1"
],
@@ -354,6 +360,11 @@
*, (glob)
0
],
+ "effect": [
+ "description",
+ "parent",
+ "content"
+ ],
"succnodes": [
"2a34000d3544",
"868d2e0eb19c"
@@ -373,6 +384,11 @@
*, (glob)
0
],
+ "effect": [
+ "description",
+ "parent",
+ "content"
+ ],
"succnodes": [
"a8df460dbbfe"
],
@@ -391,6 +407,11 @@
*, (glob)
0
],
+ "effect": [
+ "description",
+ "parent",
+ "content"
+ ],
"succnodes": [
"c473644ee0e9"
],
--- a/tests/test-evolve-effectflags.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-evolve-effectflags.t Wed Mar 21 16:32:54 2018 +0100
@@ -34,13 +34,12 @@
@ fdf9bde5129a (2) A1
|
x 471f378eab4c (1) A0
- rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (*) (glob)
$ hg log --hidden -r "desc(A0)"
changeset: 1:471f378eab4c
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- obsolete: reworded as fdf9bde5129a
summary: A0
@@ -58,13 +57,12 @@
@ 5485c92d3433 (4) B0
|
x ef4a313b1e0a (3) B0
- rewritten(user) as 5485c92d3433 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(user) as 5485c92d3433 by test (*) (glob)
$ hg log --hidden -r "ef4a313b1e0a"
changeset: 3:ef4a313b1e0a
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- obsolete: reauthored as 5485c92d3433
summary: B0
@@ -82,13 +80,12 @@
@ 4dd84345082e (6) B1
|
x 2ef0680ff450 (5) B1
- rewritten(date) as 4dd84345082e by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(date) as 4dd84345082e by test (*) (glob)
$ hg log --hidden -r "2ef0680ff450"
changeset: 5:2ef0680ff450
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- obsolete: date-changed as 4dd84345082e
summary: B1
@@ -110,13 +107,12 @@
@ 14a01456e057 (9) B2
|
x bd3db8264cee (7) B2
- rewritten(branch) as 14a01456e057 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(branch) as 14a01456e057 by test (*) (glob)
$ hg log --hidden -r "bd3db8264cee"
changeset: 7:bd3db8264cee
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- obsolete: branch-changed as 14a01456e057
summary: B2
@@ -139,13 +135,12 @@
@ da86aa2f19a3 (12) D0
|
x c85eff83a034 (11) D0
- rewritten(parent) as da86aa2f19a3 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent) as da86aa2f19a3 by test (*) (glob)
$ hg log --hidden -r "c85eff83a034"
changeset: 11:c85eff83a034
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- obsolete: rebased as da86aa2f19a3
summary: D0
@@ -165,13 +160,12 @@
@ 75781fdbdbf5 (15) E0
|
x ebfe0333e0d9 (13) E0
- rewritten(content) as 75781fdbdbf5 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(content) as 75781fdbdbf5 by test (*) (glob)
$ hg log --hidden -r "ebfe0333e0d9"
changeset: 13:ebfe0333e0d9
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- obsolete: amended as 75781fdbdbf5
summary: E0
@@ -192,13 +186,12 @@
@ a94e0fd5f1c8 (18) F1
|
x fad47e5bd78e (16) F0
- rewritten(description, user, date, branch) as a94e0fd5f1c8 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, user, date, branch) as a94e0fd5f1c8 by test (*) (glob)
$ hg log --hidden -r "fad47e5bd78e"
changeset: 16:fad47e5bd78e
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- obsolete: rewritten as a94e0fd5f1c8
summary: F0
@@ -247,14 +240,13 @@
o e509e2eb3df5 (22) H1
|
x b57fed8d8322 (20) H1
- rewritten(parent) as e509e2eb3df5 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent) as e509e2eb3df5 by test (*) (glob)
$ hg log --hidden -r "b57fed8d8322"
changeset: 20:b57fed8d8322
branch: my-other-branch
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- obsolete: rebased as e509e2eb3df5
summary: H1
amend closing the branch should be detected as meta change
@@ -272,13 +264,12 @@
@ 12c6238b5e37 (26) I0
|
x 2f599e54c1c6 (24) I0
- rewritten(meta) as 12c6238b5e37 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(meta) as 12c6238b5e37 by test (*) (glob)
$ hg log --hidden -r "2f599e54c1c6"
changeset: 24:2f599e54c1c6
branch: closedbranch
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- obsolete: meta-changed as 12c6238b5e37
summary: I0
--- a/tests/test-evolve-obshistory-complex.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-evolve-obshistory-complex.t Wed Mar 21 16:32:54 2018 +0100
@@ -79,11 +79,11 @@
@ 100cc25b765f (9) fold2
|\
x | 0da815c333f6 (5) E
- / rewritten as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, content) as 100cc25b765f by test (*) (glob)
| note: folding changesets to test
|
x d9f908fde1a1 (6) F
- rewritten as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, parent, content) as 100cc25b765f by test (*) (glob)
note: folding changesets to test
$ hg log -G
@@ -111,25 +111,21 @@
x | | changeset: 4:868d2e0eb19c
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
- | | | obsolete: rewritten as d15d0ffc75f6
| | | summary: D
| | |
x | | changeset: 3:a8df460dbbfe
|/ / user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: rewritten as d15d0ffc75f6
| | summary: C
| |
x | changeset: 2:c473644ee0e9
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: rewritten as b868bc49b0a4
| | summary: B
| |
x | changeset: 1:2a34000d3544
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten as b868bc49b0a4
| summary: A
|
o changeset: 0:ea207398892e
@@ -285,25 +281,21 @@
x | | changeset: 4:868d2e0eb19c
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
- | | | obsolete: split as 7b3290f6e0a0, d0f33db50670
| | | summary: D
| | |
x | | changeset: 3:a8df460dbbfe
|/ / user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: split as 7b3290f6e0a0, d0f33db50670
| | summary: C
| |
x | changeset: 2:c473644ee0e9
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: split as 19e14c8397fc, e036916b63ea
| | summary: B
| |
x | changeset: 1:2a34000d3544
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: split as 19e14c8397fc, e036916b63ea
| summary: A
|
o changeset: 0:ea207398892e
@@ -351,25 +343,21 @@
x | | changeset: 4:868d2e0eb19c
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
- | | | obsolete: split as 7b3290f6e0a0, ec31316faa9d
| | | summary: D
| | |
x | | changeset: 3:a8df460dbbfe
|/ / user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: split as 7b3290f6e0a0, ec31316faa9d
| | summary: C
| |
x | changeset: 2:c473644ee0e9
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: split as 19e14c8397fc, 7b3290f6e0a0
| | summary: B
| |
x | changeset: 1:2a34000d3544
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: split as 19e14c8397fc, 7b3290f6e0a0
| summary: A
|
o changeset: 0:ea207398892e
@@ -387,25 +375,25 @@
o 7b3290f6e0a0 (12) fold1
|\
x | d15d0ffc75f6 (8) fold1
- |\ \ rewritten as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000)
+ |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (*) (glob)
| | |
| | x e036916b63ea (11) fold0
- | | | rewritten as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | | rewritten(description, parent, content) as 7b3290f6e0a0 by test (*) (glob)
| | |
x | | 868d2e0eb19c (4) D
- / / rewritten as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
+ / / rewritten(description, parent, content) as d15d0ffc75f6 by test (*) (glob)
| |
x | a8df460dbbfe (3) C
- / rewritten as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, content) as d15d0ffc75f6 by test (*) (glob)
|
x b868bc49b0a4 (7) fold0
- |\ rewritten as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000)
+ |\ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (*) (glob)
| |
x | 2a34000d3544 (1) A
- / rewritten as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, content) as b868bc49b0a4 by test (*) (glob)
|
x c473644ee0e9 (2) B
- rewritten as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, parent, content) as b868bc49b0a4 by test (*) (glob)
While with all option, we should see 15 changesets
@@ -419,38 +407,38 @@
| | | | o ec31316faa9d (14) fold2
| | | |/|
| | | x | 100cc25b765f (9) fold2
- | | | |\ \ rewritten as d4a000f63ee9, ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | | |\ \ rewritten(parent, content) as d4a000f63ee9, ec31316faa9d by test (*) (glob)
| | | | | |
| +-------x d0f33db50670 (13) fold1
- | | | | | rewritten as ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | | | | rewritten(description, parent, content) as ec31316faa9d by test (*) (glob)
| | | | | note: this is a note stored in obsmarker in prune
| | | | |
+---x | | e036916b63ea (11) fold0
- | | / / rewritten as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | / / rewritten(description, parent, content) as 7b3290f6e0a0 by test (*) (glob)
| | | |
| | x | 0da815c333f6 (5) E
- | | / rewritten as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | / rewritten(description, content) as 100cc25b765f by test (*) (glob)
| | | note: folding changesets to test
| | |
x | | b868bc49b0a4 (7) fold0
- |\ \ \ rewritten as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000)
+ |\ \ \ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (*) (glob)
| | | |
| | x | d15d0ffc75f6 (8) fold1
- | | |\ \ rewritten as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (*) (glob)
| | | | |
| | | | x d9f908fde1a1 (6) F
- | | | | rewritten as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | | | rewritten(description, parent, content) as 100cc25b765f by test (*) (glob)
| | | | note: folding changesets to test
| | | |
x | | | 2a34000d3544 (1) A
- / / / rewritten as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
+ / / / rewritten(description, content) as b868bc49b0a4 by test (*) (glob)
| | |
| x | 868d2e0eb19c (4) D
- | / rewritten as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | / rewritten(description, parent, content) as d15d0ffc75f6 by test (*) (glob)
| |
| x a8df460dbbfe (3) C
- | rewritten as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, content) as d15d0ffc75f6 by test (*) (glob)
|
x c473644ee0e9 (2) B
- rewritten as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, parent, content) as b868bc49b0a4 by test (*) (glob)
--- a/tests/test-evolve-obshistory.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-evolve-obshistory.t Wed Mar 21 16:32:54 2018 +0100
@@ -41,13 +41,11 @@
| x changeset: 2:f137d23bb3e1
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: pruned
| | summary: temporary amend commit for 471f378eab4c
| |
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten as 4ae3a4151de9
| summary: A0
|
o changeset: 0:ea207398892e
@@ -61,7 +59,7 @@
@ 4ae3a4151de9 (3) A1
|
x 471f378eab4c (1) A0
- rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (*) (glob)
diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -83,7 +81,7 @@
@ [evolve.node|4ae3a4151de9] [evolve.rev|(3)] [evolve.short_description|A1]
|
x [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
- [evolve.verb|rewritten](description, content) as [evolve.node|4ae3a4151de9] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
+ [evolve.verb|rewritten](description, content) as [evolve.node|4ae3a4151de9] by [evolve.user|test] [evolve.date|(*)] (glob)
[diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description]
[diff.file_a|--- a/changeset-description]
[diff.file_b|+++ b/changeset-description]
@@ -105,7 +103,7 @@
$ hg obslog --no-graph --patch 4ae3a4151de9
4ae3a4151de9 (3) A1
471f378eab4c (1) A0
- rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (*) (glob)
diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -126,7 +124,7 @@
$ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", shortdescription)} {if(markers, join(markers % "at {date|hgdate} by {user|person} ", " also "))}'
@ A1
|
- x A0 at 0 0 by test
+ x A0 at * by test (glob)
$ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool
[
@@ -161,7 +159,7 @@
]
$ hg obslog --hidden --patch 471f378eab4c
x 471f378eab4c (1) A0
- rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (*) (glob)
diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -250,7 +248,6 @@
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: pruned
| summary: B0
|
@ changeset: 1:471f378eab4c
@@ -269,7 +266,7 @@
$ hg obslog 'desc(B0)' --hidden --patch
x 0dec01379d3b (2) B0
- pruned by test (Thu Jan 01 00:00:00 1970 +0000)
+ pruned by test (*) (glob)
(No patch available, no successors)
$ hg obslog 'desc(B0)' --hidden --no-graph -Tjson | python -m json.tool
@@ -391,7 +388,6 @@
| x changeset: 1:471597cad322
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: split as 337fec4d2edc, f257fde29c7a
| summary: A0
|
o changeset: 0:ea207398892e
@@ -405,7 +401,7 @@
Check that debugobshistory on splitted commit show both targets
$ hg obslog 471597cad322 --hidden --patch
x 471597cad322 (1) A0
- rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
note: testing split
(No patch available, too many successors (2))
@@ -418,6 +414,10 @@
*, (glob)
0 (glob)
],
+ "effect": [
+ "parent",
+ "content"
+ ],
"note": "testing split",
"succnodes": [
"337fec4d2edc",
@@ -438,7 +438,7 @@
o 337fec4d2edc (2) A0
|
x 471597cad322 (1) A0
- rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
note: testing split
(No patch available, too many successors (2))
@@ -449,7 +449,7 @@
| @ f257fde29c7a (3) A0
|/
x 471597cad322 (1) A0
- rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
note: testing split
(No patch available, too many successors (2))
@@ -459,7 +459,7 @@
@ f257fde29c7a (3) A0
|
x 471597cad322 (1) A0
- rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
note: testing split
(No patch available, too many successors (2))
@@ -470,7 +470,7 @@
| @ f257fde29c7a (3) A0
|/
x 471597cad322 (1) A0
- rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
note: testing split
(No patch available, too many successors (2))
@@ -481,7 +481,7 @@
| @ f257fde29c7a (3) A0
|/
x 471597cad322 (1) A0
- rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
note: testing split
(No patch available, too many successors (2))
@@ -493,7 +493,7 @@
| @ f257fde29c7a (3) A0
|/
x 471597cad322 (1) A0
- rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
note: testing split
(No patch available, too many successors (2))
@@ -649,7 +649,6 @@
| x changeset: 1:de7290d8b885
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: split as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a
| summary: A0
|
o changeset: 0:ea207398892e
@@ -662,7 +661,7 @@
$ hg obslog de7290d8b885 --hidden --patch
x de7290d8b885 (1) A0
- rewritten as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
(No patch available, too many successors (4))
$ hg obslog de7290d8b885 --hidden --all --patch
@@ -675,7 +674,7 @@
| o f257fde29c7a (3) A0
|/
x de7290d8b885 (1) A0
- rewritten as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
(No patch available, too many successors (4))
$ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool
@@ -687,6 +686,10 @@
*, (glob)
0 (glob)
],
+ "effect": [
+ "parent",
+ "content"
+ ],
"succnodes": [
"1ae8bc733a14",
"337fec4d2edc",
@@ -706,7 +709,7 @@
@ c7f044602e9b (5) A0
|
x de7290d8b885 (1) A0
- rewritten as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
(No patch available, too many successors (4))
$ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool
@@ -724,6 +727,10 @@
*, (glob)
0 (glob)
],
+ "effect": [
+ "parent",
+ "content"
+ ],
"succnodes": [
"1ae8bc733a14",
"337fec4d2edc",
@@ -750,7 +757,7 @@
| o f257fde29c7a (3) A0
|/
x de7290d8b885 (1) A0
- rewritten as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
(No patch available, too many successors (4))
$ hg obslog 5 --all --patch
@@ -763,7 +770,7 @@
| o f257fde29c7a (3) A0
|/
x de7290d8b885 (1) A0
- rewritten as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
(No patch available, too many successors (4))
$ hg update de7290d8b885
@@ -817,13 +824,11 @@
| x changeset: 2:0dec01379d3b
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: rewritten as eb5a0daa2192
| | summary: B0
| |
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten as eb5a0daa2192
| summary: A0
|
o changeset: 0:ea207398892e
@@ -838,7 +843,7 @@
the revision with the target
$ hg obslog --hidden 471f378eab4c --patch
x 471f378eab4c (1) A0
- rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -858,11 +863,11 @@
@ eb5a0daa2192 (3) C0
|\
x | 0dec01379d3b (2) B0
- / rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
| (No patch available, changesets rebased)
|
x 471f378eab4c (1) A0
- rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -881,7 +886,7 @@
the revision with the target
$ hg obslog --hidden 0dec01379d3b --patch
x 0dec01379d3b (2) B0
- rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
(No patch available, changesets rebased)
Check that with all option, all changesets are shown
@@ -889,11 +894,11 @@
@ eb5a0daa2192 (3) C0
|\
x | 0dec01379d3b (2) B0
- / rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
| (No patch available, changesets rebased)
|
x 471f378eab4c (1) A0
- rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -914,11 +919,11 @@
@ eb5a0daa2192 (3) C0
|\
x | 0dec01379d3b (2) B0
- / rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
| (No patch available, changesets rebased)
|
x 471f378eab4c (1) A0
- rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -948,6 +953,10 @@
*, (glob)
0 (glob)
],
+ "effect": [
+ "description",
+ "content"
+ ],
"succnodes": [
"eb5a0daa2192"
],
@@ -966,6 +975,11 @@
*, (glob)
0 (glob)
],
+ "effect": [
+ "description",
+ "parent",
+ "content"
+ ],
"succnodes": [
"eb5a0daa2192"
],
@@ -1017,7 +1031,6 @@
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded as fdf9bde5129a
| summary: A0
|
o changeset: 0:ea207398892e
@@ -1050,8 +1063,6 @@
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded as fdf9bde5129a
- | obsolete: reworded as 65b757b745b9
| summary: A0
|
o changeset: 0:ea207398892e
@@ -1065,7 +1076,7 @@
Check that debugobshistory on the divergent revision show both destinations
$ hg obslog --hidden 471f378eab4c --patch
x 471f378eab4c (1) A0
- rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 65b757b745b9 by test (*) (glob)
diff -r 471f378eab4c -r 65b757b745b9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -1073,7 +1084,7 @@
-A0
+A2
- rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (*) (glob)
diff -r 471f378eab4c -r fdf9bde5129a changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -1090,7 +1101,7 @@
| o fdf9bde5129a (2) A1
|/
x 471f378eab4c (1) A0
- rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 65b757b745b9 by test (*) (glob)
diff -r 471f378eab4c -r 65b757b745b9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -1098,7 +1109,7 @@
-A0
+A2
- rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (*) (glob)
diff -r 471f378eab4c -r fdf9bde5129a changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -1151,7 +1162,7 @@
o fdf9bde5129a (2) A1
|
x 471f378eab4c (1) A0
- rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 65b757b745b9 by test (*) (glob)
diff -r 471f378eab4c -r 65b757b745b9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -1159,7 +1170,7 @@
-A0
+A2
- rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (*) (glob)
diff -r 471f378eab4c -r fdf9bde5129a changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -1176,7 +1187,7 @@
| o fdf9bde5129a (2) A1
|/
x 471f378eab4c (1) A0
- rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 65b757b745b9 by test (*) (glob)
diff -r 471f378eab4c -r 65b757b745b9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -1184,7 +1195,7 @@
-A0
+A2
- rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (*) (glob)
diff -r 471f378eab4c -r fdf9bde5129a changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -1199,7 +1210,7 @@
@ 65b757b745b9 (3) A2
|
x 471f378eab4c (1) A0
- rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 65b757b745b9 by test (*) (glob)
diff -r 471f378eab4c -r 65b757b745b9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -1207,7 +1218,7 @@
-A0
+A2
- rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (*) (glob)
diff -r 471f378eab4c -r fdf9bde5129a changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -1223,7 +1234,7 @@
| o fdf9bde5129a (2) A1
|/
x 471f378eab4c (1) A0
- rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 65b757b745b9 by test (*) (glob)
diff -r 471f378eab4c -r 65b757b745b9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -1231,7 +1242,7 @@
-A0
+A2
- rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (*) (glob)
diff -r 471f378eab4c -r fdf9bde5129a changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -1248,7 +1259,7 @@
| o fdf9bde5129a (2) A1
|/
x 471f378eab4c (1) A0
- rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 65b757b745b9 by test (*) (glob)
diff -r 471f378eab4c -r 65b757b745b9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -1256,7 +1267,7 @@
-A0
+A2
- rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (*) (glob)
diff -r 471f378eab4c -r fdf9bde5129a changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -1347,7 +1358,6 @@
| x changeset: 2:0dec01379d3b
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded as b7ea6d14e664
| summary: B0
|
o changeset: 1:471f378eab4c
@@ -1375,19 +1385,16 @@
| | parent: 1:471f378eab4c
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: rewritten as eb5a0daa2192
| | summary: B1
| |
| | x changeset: 2:0dec01379d3b
| |/ user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: reworded as b7ea6d14e664
| | summary: B0
| |
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten as eb5a0daa2192
| summary: A0
|
o changeset: 0:ea207398892e
@@ -1403,7 +1410,7 @@
@ eb5a0daa2192 (4) C0
|\
x | 471f378eab4c (1) A0
- / rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
| diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
| --- a/changeset-description
| +++ b/changeset-description
@@ -1419,11 +1426,11 @@
|
|
x b7ea6d14e664 (3) B1
- | rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
| (No patch available, changesets rebased)
|
x 0dec01379d3b (2) B0
- rewritten(description) as b7ea6d14e664 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as b7ea6d14e664 by test (*) (glob)
diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -1437,7 +1444,7 @@
@ eb5a0daa2192 (4) C0
|\
x | 471f378eab4c (1) A0
- / rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
| diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
| --- a/changeset-description
| +++ b/changeset-description
@@ -1453,11 +1460,11 @@
|
|
x b7ea6d14e664 (3) B1
- | rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
| (No patch available, changesets rebased)
|
x 0dec01379d3b (2) B0
- rewritten(description) as b7ea6d14e664 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as b7ea6d14e664 by test (*) (glob)
diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -1481,6 +1488,11 @@
*, (glob)
0 (glob)
],
+ "effect": [
+ *, (glob)
+ *, (glob)
+ "content"
+ ],
"succnodes": [
"eb5a0daa2192"
],
@@ -1520,6 +1532,10 @@
*, (glob)
0 (glob)
],
+ "effect": [
+ "description",
+ "content"
+ ],
"succnodes": [
"eb5a0daa2192"
],
@@ -1602,13 +1618,11 @@
|/ parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded as 7a230b46bf61
| summary: A1
|
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded as fdf9bde5129a
| summary: A0
|
o changeset: 0:ea207398892e
@@ -1623,7 +1637,7 @@
@ 7a230b46bf61 (3) A2
|
x fdf9bde5129a (2) A1
- | rewritten(description) as 7a230b46bf61 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description) as 7a230b46bf61 by test (*) (glob)
| diff -r fdf9bde5129a -r 7a230b46bf61 changeset-description
| --- a/changeset-description
| +++ b/changeset-description
@@ -1633,7 +1647,7 @@
|
|
x 471f378eab4c (1) A0
- rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (*) (glob)
diff -r 471f378eab4c -r fdf9bde5129a changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -1651,7 +1665,6 @@
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)
2 new obsolescence markers
- obsoleted 1 changesets
(run 'hg heads' to see heads, 'hg merge' to merge)
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its successor: 7a230b46bf61)
@@ -1661,21 +1674,21 @@
o 7a230b46bf61 (2) A2
|
x fdf9bde5129a
- | rewritten(description) as 7a230b46bf61 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description) as 7a230b46bf61 by test (*) (glob)
| (No patch available, context is not local)
|
@ 471f378eab4c (1) A0
- rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (*) (glob)
(No patch available, successor is unknown locally)
$ hg obslog 7a230b46bf61 --color=debug --patch
o [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2]
|
x [evolve.node evolve.missing_change_ctx|fdf9bde5129a]
- | [evolve.verb|rewritten](description) as [evolve.node|7a230b46bf61] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
+ | [evolve.verb|rewritten](description) as [evolve.node|7a230b46bf61] by [evolve.user|test] [evolve.date|(*)] (glob)
| (No patch available, context is not local)
|
@ [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
- [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
+ [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] by [evolve.user|test] [evolve.date|(*)] (glob)
(No patch available, successor is unknown locally)
--- a/tests/test-evolve-orphan-split.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-evolve-orphan-split.t Wed Mar 21 16:32:54 2018 +0100
@@ -2,6 +2,11 @@
multiple successors **
$ cat >> $HGRCPATH <<EOF
+ > [defaults]
+ > amend=-d "0 0"
+ > fold=-d "0 0"
+ > split=-d "0 0"
+ > amend=-d "0 0"
> [ui]
> interactive = True
> [alias]
--- a/tests/test-evolve-phase.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-evolve-phase.t Wed Mar 21 16:32:54 2018 +0100
@@ -94,7 +94,7 @@
$ hg diff
diff -r 87495ea7c9ec a
--- a/a Thu Jan 01 00:00:00 1970 +0000
- +++ b/a Thu Jan 01 00:00:00 1970 +0000
+ +++ b/a * (glob)
@@ -1,1 +1,5 @@
+<<<<<<< destination: 87495ea7c9ec - test: b
b2
--- a/tests/test-evolve-serveronly-bundle2.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-evolve-serveronly-bundle2.t Wed Mar 21 16:32:54 2018 +0100
@@ -108,7 +108,6 @@
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files (+1 heads)
remote: 2 new obsolescence markers
- remote: obsoleted 1 changesets
$ cat ../errors.log
$ hg push
pushing to http://localhost:$HGPORT/
@@ -128,7 +127,6 @@
adding file changes
added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
2 new obsolescence markers
- obsoleted 1 changesets
(run 'hg heads' to see heads)
$ cat ../errors.log
$ hg -R ../other pull
--- a/tests/test-evolve-stop.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-evolve-stop.t Wed Mar 21 16:32:54 2018 +0100
@@ -144,7 +144,7 @@
$ hg diff
diff -r cb6a2ab625bb d
--- a/d Thu Jan 01 00:00:00 1970 +0000
- +++ b/d Thu Jan 01 00:00:00 1970 +0000
+ +++ b/d * (glob)
@@ -1,1 +1,5 @@
+<<<<<<< destination: cb6a2ab625bb - test: added c
bar
--- a/tests/test-evolve-templates.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-evolve-templates.t Wed Mar 21 16:32:54 2018 +0100
@@ -47,19 +47,16 @@
|/ parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded as d004c8f274b9 by test2
| summary: A1
|
| x changeset: 2:f137d23bb3e1
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: pruned
| | summary: temporary amend commit for 471f378eab4c
| |
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten as a468dc9b3633
| summary: A0
|
o changeset: 0:ea207398892e
@@ -79,18 +76,18 @@
o d004c8f274b9 (4) A2
|
x a468dc9b3633 (3) A1
- | rewritten(description) as d004c8f274b9 by test2 (Thu Apr 19 04:25:21 2001 +0000)
+ | rewritten(description) as d004c8f274b9 by test2 (*) (glob)
|
@ 471f378eab4c (1) A0
- rewritten(description, content) as a468dc9b3633 by test (Fri Feb 13 23:31:30 2009 +0000)
+ rewritten(description, content) as a468dc9b3633 by test (*) (glob)
$ hg tlog
o d004c8f274b9
- | Precursors: 1:471f378eab4c
- | semi-colon: 1:471f378eab4c
+ | Precursors: 471f378eab4c
+ | semi-colon: 471f378eab4c
| @ 471f378eab4c
- |/ Successors: 4:d004c8f274b9
- | semi-colon: 4:d004c8f274b9
+ |/ Successors: [d004c8f274b9]
+ | semi-colon: [d004c8f274b9]
| Fate: rewritten as d004c8f274b9 by test, test2
|
o ea207398892e
@@ -107,7 +104,6 @@
| @ changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten as d004c8f274b9 by test, test2
| summary: A0
|
o changeset: 0:ea207398892e
@@ -137,7 +133,7 @@
o d004c8f274b9
|
| @ 471f378eab4c
- |/ Obsfate: rewritten as d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000)
+ |/ Obsfate: rewritten as d004c8f274b9 by test, test2 (*) (glob)
|
o ea207398892e
@@ -168,11 +164,11 @@
Precursors template should show current revision as it is the working copy
$ hg tlog
o d004c8f274b9
- | Precursors: 3:a468dc9b3633
- | semi-colon: 3:a468dc9b3633
+ | Precursors: a468dc9b3633
+ | semi-colon: a468dc9b3633
| @ a468dc9b3633
- |/ Successors: 4:d004c8f274b9
- | semi-colon: 4:d004c8f274b9
+ |/ Successors: [d004c8f274b9]
+ | semi-colon: [d004c8f274b9]
| Fate: reworded as d004c8f274b9 by test2
|
o ea207398892e
@@ -181,25 +177,33 @@
--hidden
$ hg tlog --hidden
o d004c8f274b9
- | Precursors: 3:a468dc9b3633
- | semi-colon: 3:a468dc9b3633
+ | Precursors: a468dc9b3633
+ | semi-colon: a468dc9b3633
| @ a468dc9b3633
- |/ Precursors: 1:471f378eab4c
- | semi-colon: 1:471f378eab4c
- | Successors: 4:d004c8f274b9
- | semi-colon: 4:d004c8f274b9
+ |/ Precursors: 471f378eab4c
+ | semi-colon: 471f378eab4c
+ | Successors: [d004c8f274b9]
+ | semi-colon: [d004c8f274b9]
| Fate: reworded as d004c8f274b9 by test2
|
| x f137d23bb3e1
| | Fate: pruned
| |
| x 471f378eab4c
- |/ Successors: 3:a468dc9b3633
- | semi-colon: 3:a468dc9b3633
+ |/ Successors: [a468dc9b3633]
+ | semi-colon: [a468dc9b3633]
| Fate: rewritten as a468dc9b3633
|
o ea207398892e
+ $ hg fatelog -v
+ o d004c8f274b9
+ |
+ | @ a468dc9b3633
+ |/ Obsfate: reworded as d004c8f274b9 by test2 (*) (glob)
+ |
+ o ea207398892e
+
$ hg up 'desc(A2)'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg tlog
@@ -209,21 +213,21 @@
$ hg tlog --hidden
@ d004c8f274b9
- | Precursors: 3:a468dc9b3633
- | semi-colon: 3:a468dc9b3633
+ | Precursors: a468dc9b3633
+ | semi-colon: a468dc9b3633
| x a468dc9b3633
- |/ Precursors: 1:471f378eab4c
- | semi-colon: 1:471f378eab4c
- | Successors: 4:d004c8f274b9
- | semi-colon: 4:d004c8f274b9
+ |/ Precursors: 471f378eab4c
+ | semi-colon: 471f378eab4c
+ | Successors: [d004c8f274b9]
+ | semi-colon: [d004c8f274b9]
| Fate: reworded as d004c8f274b9 by test2
|
| x f137d23bb3e1
| | Fate: pruned
| |
| x 471f378eab4c
- |/ Successors: 3:a468dc9b3633
- | semi-colon: 3:a468dc9b3633
+ |/ Successors: [a468dc9b3633]
+ | semi-colon: [a468dc9b3633]
| Fate: rewritten as a468dc9b3633
|
o ea207398892e
@@ -238,13 +242,13 @@
@ d004c8f274b9
|
| x a468dc9b3633
- |/ Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
+ |/ Obsfate: reworded as d004c8f274b9 by test2 (*) (glob)
|
| x f137d23bb3e1
- | | Obsfate: pruned by test (at 2009-02-13 23:31 +0000)
+ | | Obsfate: pruned by test (at *) (glob)
| |
| x 471f378eab4c
- |/ Obsfate: rewritten as a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
+ |/ Obsfate: rewritten as a468dc9b3633 by test (*) (glob)
|
o ea207398892e
@@ -252,11 +256,11 @@
$ hg fatelogjson --hidden
@ d004c8f274b9 []
|
- | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}]
+ | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}] (glob)
|/
- | x f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test"]], [1234567890.0, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": [], "users": ["test"], "verb": "pruned"}]
+ | x f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test"]], [*, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [*, 0], "min_date": [*, 0], "successors": [], "users": ["test"], "verb": "pruned"}] (glob)
| |
- | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}]
+ | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}] (glob)
|/
o ea207398892e []
@@ -335,7 +339,6 @@
| x changeset: 1:471597cad322
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: split as 337fec4d2edc, f257fde29c7a
| summary: A0
|
o changeset: 0:ea207398892e
@@ -355,14 +358,14 @@
Precursors template should show current revision as it is the working copy
$ hg tlog
o f257fde29c7a
- | Precursors: 1:471597cad322
- | semi-colon: 1:471597cad322
+ | Precursors: 471597cad322
+ | semi-colon: 471597cad322
o 337fec4d2edc
- | Precursors: 1:471597cad322
- | semi-colon: 1:471597cad322
+ | Precursors: 471597cad322
+ | semi-colon: 471597cad322
| @ 471597cad322
- |/ Successors: 2:337fec4d2edc 3:f257fde29c7a
- | semi-colon: 2:337fec4d2edc 3:f257fde29c7a
+ |/ Successors: [337fec4d2edc, f257fde29c7a]
+ | semi-colon: [337fec4d2edc, f257fde29c7a]
| Fate: split as 337fec4d2edc, f257fde29c7a
|
o ea207398892e
@@ -394,14 +397,14 @@
--hidden
$ hg tlog --hidden
@ f257fde29c7a
- | Precursors: 1:471597cad322
- | semi-colon: 1:471597cad322
+ | Precursors: 471597cad322
+ | semi-colon: 471597cad322
o 337fec4d2edc
- | Precursors: 1:471597cad322
- | semi-colon: 1:471597cad322
+ | Precursors: 471597cad322
+ | semi-colon: 471597cad322
| x 471597cad322
- |/ Successors: 2:337fec4d2edc 3:f257fde29c7a
- | semi-colon: 2:337fec4d2edc 3:f257fde29c7a
+ |/ Successors: [337fec4d2edc, f257fde29c7a]
+ | semi-colon: [337fec4d2edc, f257fde29c7a]
| Fate: split as 337fec4d2edc, f257fde29c7a
|
o ea207398892e
@@ -422,7 +425,7 @@
|
o 337fec4d2edc []
|
- | x 471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}]
+ | x 471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["ef1", "12"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}] (glob)
|/
o ea207398892e []
@@ -469,13 +472,11 @@
| x changeset: 2:0dec01379d3b
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: rewritten as eb5a0daa2192
| | summary: B0
| |
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten as eb5a0daa2192
| summary: A0
|
o changeset: 0:ea207398892e
@@ -494,11 +495,11 @@
Precursors template should show current revision as it is the working copy
$ hg tlog
o eb5a0daa2192
- | Precursors: 1:471f378eab4c
- | semi-colon: 1:471f378eab4c
+ | Precursors: 471f378eab4c
+ | semi-colon: 471f378eab4c
| @ 471f378eab4c
- |/ Successors: 3:eb5a0daa2192
- | semi-colon: 3:eb5a0daa2192
+ |/ Successors: [eb5a0daa2192]
+ | semi-colon: [eb5a0daa2192]
| Fate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -520,16 +521,16 @@
displayed
$ hg tlog
o eb5a0daa2192
- | Precursors: 2:0dec01379d3b 1:471f378eab4c
- | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
+ | Precursors: 0dec01379d3b 471f378eab4c
+ | semi-colon: 0dec01379d3b; 471f378eab4c
| @ 0dec01379d3b
- | | Successors: 3:eb5a0daa2192
- | | semi-colon: 3:eb5a0daa2192
+ | | Successors: [eb5a0daa2192]
+ | | semi-colon: [eb5a0daa2192]
| | Fate: rewritten as eb5a0daa2192
| |
| x 471f378eab4c
- |/ Successors: 3:eb5a0daa2192
- | semi-colon: 3:eb5a0daa2192
+ |/ Successors: [eb5a0daa2192]
+ | semi-colon: [eb5a0daa2192]
| Fate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -560,16 +561,16 @@
--hidden
$ hg tlog --hidden
@ eb5a0daa2192
- | Precursors: 2:0dec01379d3b 1:471f378eab4c
- | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
+ | Precursors: 0dec01379d3b 471f378eab4c
+ | semi-colon: 0dec01379d3b; 471f378eab4c
| x 0dec01379d3b
- | | Successors: 3:eb5a0daa2192
- | | semi-colon: 3:eb5a0daa2192
+ | | Successors: [eb5a0daa2192]
+ | | semi-colon: [eb5a0daa2192]
| | Fate: rewritten as eb5a0daa2192
| |
| x 471f378eab4c
- |/ Successors: 3:eb5a0daa2192
- | semi-colon: 3:eb5a0daa2192
+ |/ Successors: [eb5a0daa2192]
+ | semi-colon: [eb5a0daa2192]
| Fate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -589,9 +590,9 @@
$ hg fatelogjson --hidden
@ eb5a0daa2192 []
|
- | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
+ | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob)
| |
- | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
+ | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob)
|/
o ea207398892e []
@@ -618,7 +619,6 @@
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded as fdf9bde5129a
| summary: A0
|
o changeset: 0:ea207398892e
@@ -651,8 +651,6 @@
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded as fdf9bde5129a
- | obsolete: reworded as 65b757b745b9
| summary: A0
|
o changeset: 0:ea207398892e
@@ -673,14 +671,14 @@
Precursors template should show current revision as it is the working copy
$ hg tlog
o 019fadeab383
- | Precursors: 1:471f378eab4c
- | semi-colon: 1:471f378eab4c
+ | Precursors: 471f378eab4c
+ | semi-colon: 471f378eab4c
| o fdf9bde5129a
- |/ Precursors: 1:471f378eab4c
- | semi-colon: 1:471f378eab4c
+ |/ Precursors: 471f378eab4c
+ | semi-colon: 471f378eab4c
| @ 471f378eab4c
- |/ Successors: 2:fdf9bde5129a; 4:019fadeab383
- | semi-colon: 2:fdf9bde5129a; 4:019fadeab383
+ |/ Successors: [fdf9bde5129a], [019fadeab383]
+ | semi-colon: [fdf9bde5129a]; [019fadeab383]
| Fate: reworded as fdf9bde5129a
| Fate: reworded as 019fadeab383
|
@@ -719,21 +717,21 @@
Precursors template should a precursor as we force its display with --hidden
$ hg tlog --hidden
o 019fadeab383
- | Precursors: 3:65b757b745b9
- | semi-colon: 3:65b757b745b9
+ | Precursors: 65b757b745b9
+ | semi-colon: 65b757b745b9
| x 65b757b745b9
- |/ Precursors: 1:471f378eab4c
- | semi-colon: 1:471f378eab4c
- | Successors: 4:019fadeab383
- | semi-colon: 4:019fadeab383
+ |/ Precursors: 471f378eab4c
+ | semi-colon: 471f378eab4c
+ | Successors: [019fadeab383]
+ | semi-colon: [019fadeab383]
| Fate: reworded as 019fadeab383
|
| @ fdf9bde5129a
- |/ Precursors: 1:471f378eab4c
- | semi-colon: 1:471f378eab4c
+ |/ Precursors: 471f378eab4c
+ | semi-colon: 471f378eab4c
| x 471f378eab4c
- |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9
- | semi-colon: 2:fdf9bde5129a; 3:65b757b745b9
+ |/ Successors: [fdf9bde5129a], [65b757b745b9]
+ | semi-colon: [fdf9bde5129a]; [65b757b745b9]
| Fate: reworded as fdf9bde5129a
| Fate: reworded as 65b757b745b9
|
@@ -756,11 +754,11 @@
$ hg fatelogjson --hidden
o 019fadeab383 []
|
- | x 65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}]
+ | x 65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}] (glob)
|/
| @ fdf9bde5129a []
|/
- | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "reworded"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "reworded"}]
+ | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "reworded"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "reworded"}] (glob)
|/
o ea207398892e []
@@ -788,7 +786,6 @@
| x changeset: 2:0dec01379d3b
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded as b7ea6d14e664
| summary: B0
|
o changeset: 1:471f378eab4c
@@ -816,19 +813,16 @@
| | parent: 1:471f378eab4c
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: rewritten as eb5a0daa2192
| | summary: B1
| |
| | x changeset: 2:0dec01379d3b
| |/ user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: reworded as b7ea6d14e664
| | summary: B0
| |
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten as eb5a0daa2192
| summary: A0
|
o changeset: 0:ea207398892e
@@ -845,11 +839,11 @@
(use 'hg evolve' to update to its successor: eb5a0daa2192)
$ hg tlog
o eb5a0daa2192
- | Precursors: 1:471f378eab4c
- | semi-colon: 1:471f378eab4c
+ | Precursors: 471f378eab4c
+ | semi-colon: 471f378eab4c
| @ 471f378eab4c
- |/ Successors: 4:eb5a0daa2192
- | semi-colon: 4:eb5a0daa2192
+ |/ Successors: [eb5a0daa2192]
+ | semi-colon: [eb5a0daa2192]
| Fate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -868,16 +862,16 @@
(use 'hg evolve' to update to its successor: eb5a0daa2192)
$ hg tlog
o eb5a0daa2192
- | Precursors: 2:0dec01379d3b 1:471f378eab4c
- | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
+ | Precursors: 0dec01379d3b 471f378eab4c
+ | semi-colon: 0dec01379d3b; 471f378eab4c
| @ 0dec01379d3b
- | | Successors: 4:eb5a0daa2192
- | | semi-colon: 4:eb5a0daa2192
+ | | Successors: [eb5a0daa2192]
+ | | semi-colon: [eb5a0daa2192]
| | Fate: rewritten as eb5a0daa2192
| |
| x 471f378eab4c
- |/ Successors: 4:eb5a0daa2192
- | semi-colon: 4:eb5a0daa2192
+ |/ Successors: [eb5a0daa2192]
+ | semi-colon: [eb5a0daa2192]
| Fate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -900,16 +894,16 @@
(use 'hg evolve' to update to its successor: eb5a0daa2192)
$ hg tlog
o eb5a0daa2192
- | Precursors: 1:471f378eab4c 3:b7ea6d14e664
- | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
+ | Precursors: 471f378eab4c b7ea6d14e664
+ | semi-colon: 471f378eab4c; b7ea6d14e664
| @ b7ea6d14e664
- | | Successors: 4:eb5a0daa2192
- | | semi-colon: 4:eb5a0daa2192
+ | | Successors: [eb5a0daa2192]
+ | | semi-colon: [eb5a0daa2192]
| | Fate: rewritten as eb5a0daa2192
| |
| x 471f378eab4c
- |/ Successors: 4:eb5a0daa2192
- | semi-colon: 4:eb5a0daa2192
+ |/ Successors: [eb5a0daa2192]
+ | semi-colon: [eb5a0daa2192]
| Fate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -935,23 +929,23 @@
$ hg tlog --hidden
@ eb5a0daa2192
- | Precursors: 1:471f378eab4c 3:b7ea6d14e664
- | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
+ | Precursors: 471f378eab4c b7ea6d14e664
+ | semi-colon: 471f378eab4c; b7ea6d14e664
| x b7ea6d14e664
- | | Precursors: 2:0dec01379d3b
- | | semi-colon: 2:0dec01379d3b
- | | Successors: 4:eb5a0daa2192
- | | semi-colon: 4:eb5a0daa2192
+ | | Precursors: 0dec01379d3b
+ | | semi-colon: 0dec01379d3b
+ | | Successors: [eb5a0daa2192]
+ | | semi-colon: [eb5a0daa2192]
| | Fate: rewritten as eb5a0daa2192
| |
| | x 0dec01379d3b
- | |/ Successors: 3:b7ea6d14e664
- | | semi-colon: 3:b7ea6d14e664
+ | |/ Successors: [b7ea6d14e664]
+ | | semi-colon: [b7ea6d14e664]
| | Fate: reworded as b7ea6d14e664
| |
| x 471f378eab4c
- |/ Successors: 4:eb5a0daa2192
- | semi-colon: 4:eb5a0daa2192
+ |/ Successors: [eb5a0daa2192]
+ | semi-colon: [eb5a0daa2192]
| Fate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -973,11 +967,11 @@
$ hg fatelogjson --hidden
@ eb5a0daa2192 []
|
- | x b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
+ | x b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob)
| |
- | | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}]
+ | | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}] (glob)
| |/
- | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
+ | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob)
|/
o ea207398892e []
@@ -1023,13 +1017,11 @@
|/ parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded as 7a230b46bf61
| summary: A1
|
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded as fdf9bde5129a
| summary: A0
|
o changeset: 0:ea207398892e
@@ -1046,7 +1038,6 @@
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)
2 new obsolescence markers
- obsoleted 1 changesets
(run 'hg heads' to see heads, 'hg merge' to merge)
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its successor: 7a230b46bf61)
@@ -1061,7 +1052,6 @@
| @ changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded as 7a230b46bf61
| summary: A0
|
o changeset: 0:ea207398892e
@@ -1074,11 +1064,11 @@
$ hg tlog
o 7a230b46bf61
- | Precursors: 1:471f378eab4c
- | semi-colon: 1:471f378eab4c
+ | Precursors: 471f378eab4c
+ | semi-colon: 471f378eab4c
| @ 471f378eab4c
- |/ Successors: 2:7a230b46bf61
- | semi-colon: 2:7a230b46bf61
+ |/ Successors: [7a230b46bf61]
+ | semi-colon: [7a230b46bf61]
| Fate: reworded as 7a230b46bf61
|
o ea207398892e
@@ -1087,7 +1077,7 @@
o 7a230b46bf61
|
| @ 471f378eab4c
- |/ Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
+ |/ Obsfate: reworded as 7a230b46bf61 by test (*) (glob)
|
o ea207398892e
@@ -1105,11 +1095,11 @@
$ hg tlog --hidden
@ 7a230b46bf61
- | Precursors: 1:471f378eab4c
- | semi-colon: 1:471f378eab4c
+ | Precursors: 471f378eab4c
+ | semi-colon: 471f378eab4c
| x 471f378eab4c
- |/ Successors: 2:7a230b46bf61
- | semi-colon: 2:7a230b46bf61
+ |/ Successors: [7a230b46bf61]
+ | semi-colon: [7a230b46bf61]
| Fate: reworded as 7a230b46bf61
|
o ea207398892e
@@ -1118,7 +1108,7 @@
@ 7a230b46bf61
|
| x 471f378eab4c
- |/ Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
+ |/ Obsfate: reworded as 7a230b46bf61 by test (*) (glob)
|
o ea207398892e
@@ -1126,7 +1116,7 @@
$ hg fatelogjson --hidden
@ 7a230b46bf61 []
|
- | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}]
+ | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}] (glob)
|/
o ea207398892e []
@@ -1150,9 +1140,7 @@
Create the cycle
$ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
- obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
- obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
Check templates
@@ -1174,21 +1162,21 @@
(use 'hg evolve' to update to its parent successor)
$ hg tlog
o f897c6137566
- | Precursors: 2:0dec01379d3b
- | semi-colon: 2:0dec01379d3b
+ | Precursors: 0dec01379d3b
+ | semi-colon: 0dec01379d3b
| @ 0dec01379d3b
- | | Precursors: 1:471f378eab4c
- | | semi-colon: 1:471f378eab4c
- | | Successors: 3:f897c6137566; 1:471f378eab4c
- | | semi-colon: 3:f897c6137566; 1:471f378eab4c
+ | | Precursors: 471f378eab4c
+ | | semi-colon: 471f378eab4c
+ | | Successors: [f897c6137566], [471f378eab4c]
+ | | semi-colon: [f897c6137566]; [471f378eab4c]
| | Fate: rewritten as f897c6137566
| | Fate: rewritten as 471f378eab4c
| |
| x 471f378eab4c
- |/ Precursors: 2:0dec01379d3b
- | semi-colon: 2:0dec01379d3b
- | Successors: 2:0dec01379d3b
- | semi-colon: 2:0dec01379d3b
+ |/ Precursors: 0dec01379d3b
+ | semi-colon: 0dec01379d3b
+ | Successors: [0dec01379d3b]
+ | semi-colon: [0dec01379d3b]
| Fate: rewritten as 0dec01379d3b
|
o ea207398892e
@@ -1210,8 +1198,8 @@
(use 'hg evolve' to update to its parent successor)
$ hg tlog
o f897c6137566
- | Precursors: 1:471f378eab4c
- | semi-colon: 1:471f378eab4c
+ | Precursors: 471f378eab4c
+ | semi-colon: 471f378eab4c
| @ 471f378eab4c
|/ Fate: pruned
|
@@ -1240,21 +1228,21 @@
$ hg tlog --hidden
o f897c6137566
- | Precursors: 2:0dec01379d3b
- | semi-colon: 2:0dec01379d3b
+ | Precursors: 0dec01379d3b
+ | semi-colon: 0dec01379d3b
| x 0dec01379d3b
- | | Precursors: 1:471f378eab4c
- | | semi-colon: 1:471f378eab4c
- | | Successors: 3:f897c6137566; 1:471f378eab4c
- | | semi-colon: 3:f897c6137566; 1:471f378eab4c
+ | | Precursors: 471f378eab4c
+ | | semi-colon: 471f378eab4c
+ | | Successors: [f897c6137566], [471f378eab4c]
+ | | semi-colon: [f897c6137566]; [471f378eab4c]
| | Fate: rewritten as f897c6137566
| | Fate: rewritten as 471f378eab4c
| |
| x 471f378eab4c
- |/ Precursors: 2:0dec01379d3b
- | semi-colon: 2:0dec01379d3b
- | Successors: 2:0dec01379d3b
- | semi-colon: 2:0dec01379d3b
+ |/ Precursors: 0dec01379d3b
+ | semi-colon: 0dec01379d3b
+ | Successors: [0dec01379d3b]
+ | semi-colon: [0dec01379d3b]
| Fate: rewritten as 0dec01379d3b
|
@ ea207398892e
@@ -1330,7 +1318,6 @@
summary: ROOT
$ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"`
- obsoleted 1 changesets
$ hg log -G
@ changeset: 7:ba2ed02b0c9a
| tag: tip
@@ -1399,8 +1386,6 @@
| x changeset: 6:4a004186e638
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded as b18bc8331526
- | obsolete: reworded as 0b997eb7ceee
| summary: Add A,B,C
|
o changeset: 5:dd800401bd8c
@@ -1426,16 +1411,16 @@
$ hg tlog
@ 0b997eb7ceee
- | Precursors: 6:4a004186e638
- | semi-colon: 6:4a004186e638
+ | Precursors: 4a004186e638
+ | semi-colon: 4a004186e638
| o b18bc8331526
- |/ Precursors: 6:4a004186e638
- | semi-colon: 6:4a004186e638
+ |/ Precursors: 4a004186e638
+ | semi-colon: 4a004186e638
| o ba2ed02b0c9a
| |
| x 4a004186e638
- |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee
- | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
+ |/ Successors: [b18bc8331526], [0b997eb7ceee]
+ | semi-colon: [b18bc8331526]; [0b997eb7ceee]
| Fate: reworded as b18bc8331526
| Fate: reworded as 0b997eb7ceee
|
@@ -1463,46 +1448,46 @@
$ hg tlog --hidden
@ 0b997eb7ceee
- | Precursors: 6:4a004186e638
- | semi-colon: 6:4a004186e638
+ | Precursors: 4a004186e638
+ | semi-colon: 4a004186e638
| o b18bc8331526
- |/ Precursors: 6:4a004186e638
- | semi-colon: 6:4a004186e638
+ |/ Precursors: 4a004186e638
+ | semi-colon: 4a004186e638
| o ba2ed02b0c9a
- | | Precursors: 4:9bd10a0775e4
- | | semi-colon: 4:9bd10a0775e4
+ | | Precursors: 9bd10a0775e4
+ | | semi-colon: 9bd10a0775e4
| x 4a004186e638
- |/ Precursors: 4:9bd10a0775e4
- | semi-colon: 4:9bd10a0775e4
- | Successors: 8:b18bc8331526; 9:0b997eb7ceee
- | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
+ |/ Precursors: 9bd10a0775e4
+ | semi-colon: 9bd10a0775e4
+ | Successors: [b18bc8331526], [0b997eb7ceee]
+ | semi-colon: [b18bc8331526]; [0b997eb7ceee]
| Fate: reworded as b18bc8331526
| Fate: reworded as 0b997eb7ceee
|
o dd800401bd8c
- | Precursors: 4:9bd10a0775e4
- | semi-colon: 4:9bd10a0775e4
+ | Precursors: 9bd10a0775e4
+ | semi-colon: 9bd10a0775e4
| x 9bd10a0775e4
- |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
- | semi-colon: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
+ |/ Successors: [dd800401bd8c, 4a004186e638, ba2ed02b0c9a]
+ | semi-colon: [dd800401bd8c, 4a004186e638, ba2ed02b0c9a]
| Fate: split as 4a004186e638, ba2ed02b0c9a, dd800401bd8c
|
o f897c6137566
- | Precursors: 2:0dec01379d3b
- | semi-colon: 2:0dec01379d3b
+ | Precursors: 0dec01379d3b
+ | semi-colon: 0dec01379d3b
| x 0dec01379d3b
- | | Precursors: 1:471f378eab4c
- | | semi-colon: 1:471f378eab4c
- | | Successors: 3:f897c6137566; 1:471f378eab4c
- | | semi-colon: 3:f897c6137566; 1:471f378eab4c
+ | | Precursors: 471f378eab4c
+ | | semi-colon: 471f378eab4c
+ | | Successors: [f897c6137566], [471f378eab4c]
+ | | semi-colon: [f897c6137566]; [471f378eab4c]
| | Fate: rewritten as f897c6137566
| | Fate: rewritten as 471f378eab4c
| |
| x 471f378eab4c
- |/ Precursors: 2:0dec01379d3b
- | semi-colon: 2:0dec01379d3b
- | Successors: 2:0dec01379d3b
- | semi-colon: 2:0dec01379d3b
+ |/ Precursors: 0dec01379d3b
+ | semi-colon: 0dec01379d3b
+ | Successors: [0dec01379d3b]
+ | semi-colon: [0dec01379d3b]
| Fate: rewritten as 0dec01379d3b
|
o ea207398892e
@@ -1540,20 +1525,20 @@
rebasing 7:ba2ed02b0c9a "Add A,B,C"
$ hg tlog
o eceed8f98ffc
- | Precursors: 4:9bd10a0775e4
- | semi-colon: 4:9bd10a0775e4
+ | Precursors: 9bd10a0775e4
+ | semi-colon: 9bd10a0775e4
| o 0b997eb7ceee
- | | Precursors: 4:9bd10a0775e4
- | | semi-colon: 4:9bd10a0775e4
+ | | Precursors: 9bd10a0775e4
+ | | semi-colon: 9bd10a0775e4
o | b18bc8331526
- |/ Precursors: 4:9bd10a0775e4
- | semi-colon: 4:9bd10a0775e4
+ |/ Precursors: 9bd10a0775e4
+ | semi-colon: 9bd10a0775e4
o dd800401bd8c
- | Precursors: 4:9bd10a0775e4
- | semi-colon: 4:9bd10a0775e4
+ | Precursors: 9bd10a0775e4
+ | semi-colon: 9bd10a0775e4
| @ 9bd10a0775e4
- |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
- | semi-colon: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
+ |/ Successors: [dd800401bd8c, 0b997eb7ceee, eceed8f98ffc], [dd800401bd8c, b18bc8331526, eceed8f98ffc]
+ | semi-colon: [dd800401bd8c, 0b997eb7ceee, eceed8f98ffc]; [dd800401bd8c, b18bc8331526, eceed8f98ffc]
| Fate: split as 0b997eb7ceee, dd800401bd8c, eceed8f98ffc
| Fate: split as b18bc8331526, dd800401bd8c, eceed8f98ffc
|
@@ -1607,7 +1592,7 @@
$ hg fatelog -v
@ 471f378eab4c
- | Obsfate: pruned by test (at 1970-01-01 00:00 +0000)
+ | Obsfate: pruned by test (at *) (glob)
|
o ea207398892e
--- a/tests/test-evolve.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-evolve.t Wed Mar 21 16:32:54 2018 +0100
@@ -620,8 +620,8 @@
o 0:8685c6d34325@default(draft) add 0
$ hg debugobsolete
- 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (*) {'ef1': '4', 'user': 'test'} (glob)
+ db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (*) {'ef1': '13', 'user': 'test'} (glob)
Test graft --continue
@@ -665,9 +665,9 @@
o 0:8685c6d34325@default(draft) add 0
$ hg debugobsolete
- 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 920e58bb443b73eea9d6d65570b4241051ea3229 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (*) {'ef1': '4', 'user': 'test'} (glob)
+ db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (*) {'ef1': '13', 'user': 'test'} (glob)
+ a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 920e58bb443b73eea9d6d65570b4241051ea3229 0 (*) {'ef1': '12', 'user': 'test'} (glob)
Test touch
@@ -770,12 +770,12 @@
@ d26d339c513f (12) add 4
|\
x | af636757ce3b (11) add 3
- |\ \ rewritten as d26d339c513f by test (Thu Jan 01 00:00:00 1970 +0000)
+ |\ \ rewritten(description, user, parent, content) as d26d339c513f by test (*) (glob)
| | |
| \ \
| |\ \
| | | x ce341209337f (4) add 4
- | | | rewritten as d26d339c513f by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | | rewritten(description, user, content) as d26d339c513f by test (*) (glob)
| | |
Test obsstore stat
@@ -789,6 +789,7 @@
2 successors: 0
more than 2 successors: 0
available keys:
+ ef1: 10
user: 10
marker size:
format v1:
@@ -797,10 +798,10 @@
median length: * (glob)
mean length: * (glob)
format v0:
- smallest length: 66
- longer length: 66
- median length: 66
- mean length: 66
+ smallest length: * (glob)
+ longer length: * (glob)
+ median length: * (glob)
+ mean length: * (glob)
disconnected clusters: 1
any known node: 1
smallest length: 10
--- a/tests/test-exchange-obsmarkers-case-A1.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-A1.t Wed Mar 21 16:32:54 2018 +0100
@@ -61,7 +61,7 @@
$ inspect_obsmarkers
obsstore content
================
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
obshashtree
===========
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
@@ -88,7 +88,7 @@
# testing echange of "A" (f5bc6836db60)
## initial state
# obstore: main
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing "A" from main to pushdest
@@ -101,9 +101,9 @@
remote: 1 new obsolescence markers
## post push state
# obstore: main
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
## pulling "f5bc6836db60" from main into pulldest
pulling from main
@@ -116,11 +116,11 @@
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
Variant b: push
---------------
@@ -129,7 +129,7 @@
## Running testcase A.1.1.b
## initial state
# obstore: main
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing from main to pushdest
@@ -142,9 +142,9 @@
remote: 1 new obsolescence markers
## post push state
# obstore: main
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
## pulling from main into pulldest
pulling from main
@@ -157,11 +157,11 @@
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
A.1.2 pushing multiple changesets into a single head
====================================================
@@ -212,7 +212,7 @@
$ inspect_obsmarkers
obsstore content
================
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
obshashtree
===========
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
@@ -242,7 +242,7 @@
# testing echange of "B" (f6fbb35d8ac9)
## initial state
# obstore: main
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing "B" from main to pushdest
@@ -255,9 +255,9 @@
remote: 1 new obsolescence markers
## post push state
# obstore: main
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
## pulling "f6fbb35d8ac9" from main into pulldest
pulling from main
@@ -270,11 +270,11 @@
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
Variant b: push
---------------
@@ -283,7 +283,7 @@
## Running testcase A.1.2.b
## initial state
# obstore: main
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing from main to pushdest
@@ -296,9 +296,9 @@
remote: 1 new obsolescence markers
## post push state
# obstore: main
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
## pulling from main into pulldest
pulling from main
@@ -311,8 +311,8 @@
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
--- a/tests/test-exchange-obsmarkers-case-A2.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-A2.t Wed Mar 21 16:32:54 2018 +0100
@@ -71,8 +71,8 @@
$ inspect_obsmarkers
obsstore content
================
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (*) {'user': 'test'} (glob)
obshashtree
===========
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
@@ -97,8 +97,8 @@
# testing echange of "A" (f5bc6836db60)
## initial state
# obstore: main
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing "A" from main to pushdest
@@ -111,10 +111,10 @@
remote: 1 new obsolescence markers
## post push state
# obstore: main
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
## pulling "f5bc6836db60" from main into pulldest
pulling from main
@@ -127,11 +127,11 @@
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
$ cd ..
--- a/tests/test-exchange-obsmarkers-case-A3.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-A3.t Wed Mar 21 16:32:54 2018 +0100
@@ -73,9 +73,7 @@
$ mkcommit B1
created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
- obsoleted 1 changesets
$ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
- obsoleted 1 changesets
$ hg log -G --hidden
@ f6298a8ac3a4 (draft): B1
|
@@ -90,8 +88,8 @@
$ inspect_obsmarkers
obsstore content
================
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
obshashtree
===========
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
@@ -118,8 +116,8 @@
# testing echange of "A1" (e5ea8f9c7314)
## initial state
# obstore: main
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing "A1" from main to pushdest
@@ -132,10 +130,10 @@
remote: 1 new obsolescence markers
## post push state
# obstore: main
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
## pulling "e5ea8f9c7314" from main into pulldest
pulling from main
@@ -148,12 +146,12 @@
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
other variant: changeset known in remote
----------------------------------------
@@ -176,9 +174,7 @@
$ mkcommit B1
created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
- obsoleted 1 changesets
$ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
- obsoleted 1 changesets
$ hg log -G --hidden
@ f6298a8ac3a4 (draft): B1
|
@@ -193,8 +189,8 @@
$ inspect_obsmarkers
obsstore content
================
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
obshashtree
===========
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
@@ -234,8 +230,8 @@
# testing echange of "A1" (e5ea8f9c7314)
## initial state
# obstore: main
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing "A1" from main to pushdest
@@ -246,13 +242,12 @@
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files (+1 heads)
remote: 1 new obsolescence markers
- remote: obsoleted 1 changesets
## post push state
# obstore: main
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
## pulling "e5ea8f9c7314" from main into pulldest
pulling from main
@@ -262,14 +257,13 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
1 new obsolescence markers
- obsoleted 1 changesets
(run 'hg heads' to see heads, 'hg merge' to merge)
1 new unstable changesets
## post pull state
# obstore: main
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
--- a/tests/test-exchange-obsmarkers-case-A4.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-A4.t Wed Mar 21 16:32:54 2018 +0100
@@ -64,7 +64,6 @@
created new head
$ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
- obsoleted 1 changesets
$ hg log -G --hidden
@ e5ea8f9c7314 (draft): A1
|
@@ -77,8 +76,8 @@
$ inspect_obsmarkers
obsstore content
================
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
obshashtree
===========
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
@@ -106,8 +105,8 @@
# testing echange of "B" (06055a7959d4)
## initial state
# obstore: main
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing "B" from main to pushdest
@@ -120,10 +119,10 @@
remote: 1 new obsolescence markers
## post push state
# obstore: main
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
## pulling "06055a7959d4" from main into pulldest
pulling from main
@@ -136,9 +135,9 @@
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
--- a/tests/test-exchange-obsmarkers-case-A5.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-A5.t Wed Mar 21 16:32:54 2018 +0100
@@ -66,9 +66,7 @@
$ mkcommit A1
$ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
$ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
- obsoleted 1 changesets
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
- obsoleted 1 changesets
$ hg log -G --hidden
@ 8c0a98c83722 (draft): A1
|
@@ -83,9 +81,9 @@
$ inspect_obsmarkers
obsstore content
================
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (*) {'user': 'test'} (glob)
obshashtree
===========
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
@@ -112,9 +110,9 @@
# testing echange of "B1" (f6298a8ac3a4)
## initial state
# obstore: main
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (*) {'user': 'test'} (glob)
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing "B1" from main to pushdest
@@ -127,11 +125,11 @@
remote: 1 new obsolescence markers
## post push state
# obstore: main
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (*) {'user': 'test'} (glob)
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
## pulling "f6298a8ac3a4" from main into pulldest
pulling from main
@@ -144,10 +142,10 @@
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (*) {'user': 'test'} (glob)
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
- 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
--- a/tests/test-exchange-obsmarkers-case-A6.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-A6.t Wed Mar 21 16:32:54 2018 +0100
@@ -64,7 +64,6 @@
create a marker after this
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
- obsoleted 1 changesets
$ hg log -G --hidden
@ e5ea8f9c7314 (draft): A1
|
@@ -109,7 +108,6 @@
searching for changes
no changes found
remote: 1 new obsolescence markers
- remote: obsoleted 1 changesets
## post push state
# obstore: main
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -120,7 +118,6 @@
pulling from main
no changes found
1 new obsolescence markers
- obsoleted 1 changesets
## post pull state
# obstore: main
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -144,7 +141,6 @@
searching for changes
no changes found
remote: 1 new obsolescence markers
- remote: obsoleted 1 changesets
## post push state
# obstore: main
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -156,7 +152,6 @@
searching for changes
no changes found
1 new obsolescence markers
- obsoleted 1 changesets
## post pull state
# obstore: main
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-B1.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-B1.t Wed Mar 21 16:32:54 2018 +0100
@@ -70,18 +70,18 @@
$ inspect_obsmarkers
obsstore content
================
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
obshashtree
===========
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 926d9d84b97b3483891ae983990ad87c1f7827e9
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af c2398c6305068b6b377f36402c507b713a7c586f
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 8408066feeb4e37fa26d01fe5c93bea92e450608
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 535b0c799a3a273fee10934abcb9e8eb9924b4bf
obshashrange
============
rev node index size depth obshash
- 1 f5bc6836db60 0 2 2 926d9d84b97b
+ 1 f5bc6836db60 0 2 2 8408066feeb4
0 a9bdc8b26820 0 1 1 000000000000
- 1 f5bc6836db60 1 1 2 926d9d84b97b
+ 1 f5bc6836db60 1 1 2 8408066feeb4
$ cd ..
$ cd ..
@@ -93,7 +93,7 @@
# testing echange of "O" (a9bdc8b26820)
## initial state
# obstore: main
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing "O" from main to pushdest
@@ -102,7 +102,7 @@
no changes found
## post push state
# obstore: main
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pulling "a9bdc8b26820" from main into pulldest
@@ -110,6 +110,6 @@
no changes found
## post pull state
# obstore: main
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
--- a/tests/test-exchange-obsmarkers-case-B2.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-B2.t Wed Mar 21 16:32:54 2018 +0100
@@ -61,15 +61,15 @@
$ inspect_obsmarkers
obsstore content
================
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
obshashtree
===========
- a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 52a5380bc04783a9ad43bb2ab2f47a02ef02adcc
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 6892277170c13fec6712303d639965a454b5cabf
+ a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 62d86865fd15a1e1b0ef16ebb9cb851689032dd8
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 6e3ba325674c3b035b63ec3db449ad2853a18372
obshashrange
============
rev node index size depth obshash
- 0 a9bdc8b26820 0 1 1 52a5380bc047
+ 0 a9bdc8b26820 0 1 1 62d86865fd15
$ cd ..
$ cd ..
@@ -84,7 +84,7 @@
# testing echange of "O" (a9bdc8b26820)
## initial state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing "O" from main to pushdest
@@ -94,9 +94,9 @@
remote: 1 new obsolescence markers
## post push state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pulldest
## pulling "a9bdc8b26820" from main into pulldest
pulling from main
@@ -104,11 +104,11 @@
1 new obsolescence markers
## post pull state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pulldest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
Actual Test (bare push version)
-----------------------------------
@@ -117,7 +117,7 @@
## Running testcase B.2.b
## initial state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing from main to pushdest
@@ -127,9 +127,9 @@
remote: 1 new obsolescence markers
## post push state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pulldest
## pulling from main into pulldest
pulling from main
@@ -138,8 +138,8 @@
1 new obsolescence markers
## post pull state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pulldest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
--- a/tests/test-exchange-obsmarkers-case-B3.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-B3.t Wed Mar 21 16:32:54 2018 +0100
@@ -72,19 +72,19 @@
$ inspect_obsmarkers
obsstore content
================
- e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (*) {'ef1': '*', 'user': 'test'} (glob)
obshashtree
===========
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
f5bc6836db60e308a17ba08bf050154ba9c4fad7 0000000000000000000000000000000000000000
- 35b1839966785d5703a01607229eea932db42f87 631ab4cd02ffa1d144dc8f32a18be574076031e3
- e56289ab6378dc752fd7965f8bf66b58bda740bd a37fa02ad96f2e8ecce7080e73cfe22af8e1b14f
+ 35b1839966785d5703a01607229eea932db42f87 d6033d6b3eb3451694dde5b6dd2356ae57eff23b
+ e56289ab6378dc752fd7965f8bf66b58bda740bd f4bc7329023b9b1f7db3b7989fd7f80a2ca7a008
obshashrange
============
rev node index size depth obshash
- 2 35b183996678 0 2 2 631ab4cd02ff
+ 2 35b183996678 0 2 2 d6033d6b3eb3
1 f5bc6836db60 0 2 2 000000000000
- 2 35b183996678 1 1 2 631ab4cd02ff
+ 2 35b183996678 1 1 2 d6033d6b3eb3
0 a9bdc8b26820 0 1 1 000000000000
1 f5bc6836db60 1 1 2 000000000000
$ cd ..
@@ -98,7 +98,7 @@
# testing echange of "A" (f5bc6836db60)
## initial state
# obstore: main
- e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing "A" from main to pushdest
@@ -110,7 +110,7 @@
remote: added 1 changesets with 1 changes to 1 files
## post push state
# obstore: main
- e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pulling "f5bc6836db60" from main into pulldest
@@ -123,7 +123,7 @@
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
- e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
--- a/tests/test-exchange-obsmarkers-case-B4.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-B4.t Wed Mar 21 16:32:54 2018 +0100
@@ -87,19 +87,19 @@
$ inspect_obsmarkers
obsstore content
================
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
obshashtree
===========
- a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 1900882e85db10a1dc5bc7748f436a8a834356c6
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 c27e764c783f451ef3aa40daf2a3795e6674cd06
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 907beff79fdff2b82b5d3bed7989107a6d744508
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 86e6b5a5ad828d83b3205ea4ca11154972da19a1
+ a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 000a06f93df9cdd3c570d38aef8cd21a4a25df9b
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 ff621c458a04f2994124b0ef4b43572f7eb2335a
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 5afda6754e34bfe9ac1942df123711f929054273
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed f3513f70438639d6687bbec74f4d3fd11853f471
obshashrange
============
rev node index size depth obshash
2 f6fbb35d8ac9 0 3 3 000000000000
1 f5bc6836db60 0 2 2 000000000000
- 0 a9bdc8b26820 0 1 1 1900882e85db
+ 0 a9bdc8b26820 0 1 1 000a06f93df9
1 f5bc6836db60 1 1 2 000000000000
2 f6fbb35d8ac9 2 1 3 000000000000
$ cd ..
@@ -116,7 +116,7 @@
# testing echange of "O" (a9bdc8b26820)
## initial state
# obstore: main
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing "O" from main to pushdest
@@ -126,9 +126,9 @@
remote: 1 new obsolescence markers
## post push state
# obstore: main
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pulldest
## pulling "a9bdc8b26820" from main into pulldest
pulling from main
@@ -136,11 +136,11 @@
1 new obsolescence markers
## post pull state
# obstore: main
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pulldest
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
Actual Test (bare push version)
-----------------------------------
@@ -149,7 +149,7 @@
## Running testcase B.4.b
## initial state
# obstore: main
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing from main to pushdest
@@ -159,9 +159,9 @@
remote: 1 new obsolescence markers
## post push state
# obstore: main
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pulldest
## pulling from main into pulldest
pulling from main
@@ -170,8 +170,8 @@
1 new obsolescence markers
## post pull state
# obstore: main
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pulldest
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
--- a/tests/test-exchange-obsmarkers-case-B5.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-B5.t Wed Mar 21 16:32:54 2018 +0100
@@ -70,10 +70,8 @@
created new head
$ mkcommit B1
$ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'`
- obsoleted 1 changesets
$ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'`
$ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'`
- obsoleted 1 changesets
$ hg prune -qd '0 0' 'desc(B1)'
$ hg log -G --hidden
x 069b05c3876d (draft): B1
@@ -91,30 +89,30 @@
$ inspect_obsmarkers
obsstore content
================
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (*) {'user': 'test'} (glob)
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 0 (*) {'user': 'test'} (glob)
+ 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (*) {'ef1': '*', 'user': 'test'} (glob)
obshashtree
===========
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000
6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 13bd00d88332fcd3fe634ed42f9d35c9cfc06398
1d0f3cd253006f014c7687a78abbc9287db4101d 01d985a82467333a4de7a5b4e8a0de3286f8bda8
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 d2b1159bcf3694aabc3674785b1859544c35357d
- 069b05c3876d56f62895e853a501ea58ea85f68d a07163ee7e7cda4065f7593715b7b12f833f7065
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 13bd4798a9a787c0b54db36e03ec580012600b50
+ 069b05c3876d56f62895e853a501ea58ea85f68d 35916a1d760564c67d3a68921fd5908f28b486c0
obshashrange
============
rev node index size depth obshash
3 1d0f3cd25300 0 4 4 000000000000
3 1d0f3cd25300 2 2 4 000000000000
1 28b51eb45704 0 2 2 000000000000
- 4 e5ea8f9c7314 0 2 2 d2b1159bcf36
+ 4 e5ea8f9c7314 0 2 2 13bd4798a9a7
3 1d0f3cd25300 3 1 4 000000000000
1 28b51eb45704 1 1 2 000000000000
2 6e72f0a95b5e 2 1 3 13bd00d88332
0 a9bdc8b26820 0 1 1 000000000000
- 4 e5ea8f9c7314 1 1 2 d2b1159bcf36
+ 4 e5ea8f9c7314 1 1 2 13bd4798a9a7
$ cd ..
$ cd ..
@@ -126,10 +124,10 @@
# testing echange of "C" (1d0f3cd25300)
## initial state
# obstore: main
- 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 0 (*) {'user': 'test'} (glob)
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing "C" from main to pushdest
@@ -142,12 +140,12 @@
remote: 1 new obsolescence markers
## post push state
# obstore: main
- 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 0 (*) {'user': 'test'} (glob)
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
## pulling "1d0f3cd25300" from main into pulldest
pulling from main
@@ -160,11 +158,11 @@
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
- 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 0 (*) {'user': 'test'} (glob)
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (*) {'user': 'test'} (glob)
--- a/tests/test-exchange-obsmarkers-case-B6.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-B6.t Wed Mar 21 16:32:54 2018 +0100
@@ -57,7 +57,6 @@
$ mkcommit B1
created new head
$ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
- obsoleted 1 changesets
$ hg prune -qd '0 0' .
$ hg log -G --hidden
x f6298a8ac3a4 (draft): B1
@@ -71,19 +70,19 @@
$ inspect_obsmarkers
obsstore content
================
- 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
+ f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
obshashtree
===========
- a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 86e41541149f4b6cccc5fd131d744d8e83a681e5
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 f2e05412d3f1d5bc1ae647cf9efc43e0399c26ca
- 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b 974507d1c466d0aa86d288836194339ed3b98736
- f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 1e0b6dce792c229c865a543c6f8964b4bba5fb5a
+ a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 6d4265767de9c3095bc6ec62648c64610d3fe9cd
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 52260e159f886b089e44a0eb7325683e93a18a5a
+ 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b 4f5b201f1c8023e258712dcd02ca1239b41a91c4
+ f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 8e0762e9ba2cff99bfa111d56788341de35e80b1
obshashrange
============
rev node index size depth obshash
1 f5bc6836db60 0 2 2 000000000000
- 0 a9bdc8b26820 0 1 1 86e41541149f
+ 0 a9bdc8b26820 0 1 1 6d4265767de9
1 f5bc6836db60 1 1 2 000000000000
$ cd ..
$ cd ..
@@ -96,8 +95,8 @@
# testing echange of "O" (a9bdc8b26820)
## initial state
# obstore: main
- 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
+ f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing "O" from main to pushdest
@@ -107,11 +106,11 @@
remote: 2 new obsolescence markers
## post push state
# obstore: main
- 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
+ f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
- 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
+ f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pulldest
## pulling "a9bdc8b26820" from main into pulldest
pulling from main
@@ -119,12 +118,12 @@
2 new obsolescence markers
## post pull state
# obstore: main
- 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
+ f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
- 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
+ f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pulldest
- 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
+ f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
--- a/tests/test-exchange-obsmarkers-case-B7.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-B7.t Wed Mar 21 16:32:54 2018 +0100
@@ -66,18 +66,18 @@
$ inspect_obsmarkers
obsstore content
================
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
obshashtree
===========
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 926d9d84b97b3483891ae983990ad87c1f7827e9
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af c2398c6305068b6b377f36402c507b713a7c586f
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 8408066feeb4e37fa26d01fe5c93bea92e450608
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 535b0c799a3a273fee10934abcb9e8eb9924b4bf
obshashrange
============
rev node index size depth obshash
- 1 f5bc6836db60 0 2 2 926d9d84b97b
+ 1 f5bc6836db60 0 2 2 8408066feeb4
0 a9bdc8b26820 0 1 1 000000000000
- 1 f5bc6836db60 1 1 2 926d9d84b97b
+ 1 f5bc6836db60 1 1 2 8408066feeb4
$ cd ..
$ cd ..
@@ -89,7 +89,7 @@
# testing echange of "O" (a9bdc8b26820)
## initial state
# obstore: main
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing "O" from main to pushdest
@@ -98,7 +98,7 @@
no changes found
## post push state
# obstore: main
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pulling "a9bdc8b26820" from main into pulldest
@@ -106,6 +106,6 @@
no changes found
## post pull state
# obstore: main
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
--- a/tests/test-exchange-obsmarkers-case-C1.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-C1.t Wed Mar 21 16:32:54 2018 +0100
@@ -70,17 +70,17 @@
$ inspect_obsmarkers
obsstore content
================
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
obshashtree
===========
- a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 1ce18e5a71f78d443a80c819f2f7197c4706af70
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 5c3c935df6f4007c633c3386d6f58b22c274809e
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af bccb3d243420ef26782fa11f209830db360c34b2
+ a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 2eae6a894c52a556ac692c2d0da80e81548b9f08
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 36f7fefb84e169c95144b085ce25607908f43c05
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af b5e9a0fe6060fb80fa51366d6fc5b8f3a5c6e1ed
obshashrange
============
rev node index size depth obshash
- 0 a9bdc8b26820 0 1 1 1ce18e5a71f7
+ 0 a9bdc8b26820 0 1 1 2eae6a894c52
$ cd ..
$ cd ..
@@ -95,8 +95,8 @@
# testing echange of "O" (a9bdc8b26820)
## initial state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing "O" from main to pushdest
@@ -106,11 +106,11 @@
remote: 2 new obsolescence markers
## post push state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pulldest
## pulling "a9bdc8b26820" from main into pulldest
pulling from main
@@ -118,14 +118,14 @@
2 new obsolescence markers
## post pull state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pulldest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
Actual Test (bare push)
-------------------------------------
@@ -134,8 +134,8 @@
## Running testcase C.1.b
## initial state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing from main to pushdest
@@ -145,11 +145,11 @@
remote: 2 new obsolescence markers
## post push state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pulldest
## pulling from main into pulldest
pulling from main
@@ -158,11 +158,11 @@
2 new obsolescence markers
## post pull state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pulldest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
--- a/tests/test-exchange-obsmarkers-case-C2.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-C2.t Wed Mar 21 16:32:54 2018 +0100
@@ -62,7 +62,6 @@
$ mkcommit A1
created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
- obsoleted 1 changesets
$ hg log -G --hidden
@ e5ea8f9c7314 (draft): A1
|
@@ -75,20 +74,20 @@
$ inspect_obsmarkers
obsstore content
================
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
obshashtree
===========
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 72f95b7b9fa12243aeb90433d211f2c38263da31
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 9d758cd0bf02f27e9b7de5665b10ceb1dc8bb1f1
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 289cb0d058c81c763eca8bb438657dba9a7ba646
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 3ef2e3b1b37e7a3a8a885b2ff08fa626f1d3aaa9
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 75187bd51740051fdf046fae67687fb056343515
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 163059af30d498e215e86e1ead6ab749521c38be
obshashrange
============
rev node index size depth obshash
- 3 e5ea8f9c7314 0 2 2 289cb0d058c8
+ 3 e5ea8f9c7314 0 2 2 163059af30d4
0 a9bdc8b26820 0 1 1 000000000000
- 3 e5ea8f9c7314 1 1 2 289cb0d058c8
+ 3 e5ea8f9c7314 1 1 2 163059af30d4
$ cd ..
$ cd ..
@@ -103,8 +102,8 @@
# testing echange of "A1" (e5ea8f9c7314)
## initial state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing "A1" from main to pushdest
@@ -117,11 +116,11 @@
remote: 2 new obsolescence markers
## post push state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
## pulling "e5ea8f9c7314" from main into pulldest
pulling from main
@@ -134,14 +133,14 @@
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
Actual Test (bare push)
-------------------------------------
@@ -150,8 +149,8 @@
## Running testcase C.2.b
## initial state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing from main to pushdest
@@ -164,11 +163,11 @@
remote: 2 new obsolescence markers
## post push state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
## pulling from main into pulldest
pulling from main
@@ -181,11 +180,11 @@
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
--- a/tests/test-exchange-obsmarkers-case-C3.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-C3.t Wed Mar 21 16:32:54 2018 +0100
@@ -64,7 +64,6 @@
$ mkcommit A1
created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
- obsoleted 1 changesets
$ hg prune -qd '0 0' .
$ hg log -G --hidden
x e5ea8f9c7314 (draft): A1
@@ -78,19 +77,19 @@
$ inspect_obsmarkers
obsstore content
================
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
obshashtree
===========
- a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 40be80b35671116f2c61ef25797806536a6eb5a0
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f beac7228bbe708bc7c9181c3c27f8a17f21dbd9f
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 04b20150f38991d297ecfe0bf0f77deb816aed9d
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 a59f7d5ea437389a33d2e98b9b85ba1d568a743e
+ a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 683625eeec1568e2bc1acd6e956de89102cea428
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f b8b53eb8289f96d4de4e2add5dd8605b4af5bab9
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 26513b68de67734af5dbfeb3b4475aa3b14ed940
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 3edacd6f3e9c4546d31990ce890315abbeb17eab
obshashrange
============
rev node index size depth obshash
- 0 a9bdc8b26820 0 1 1 40be80b35671
+ 0 a9bdc8b26820 0 1 1 683625eeec15
$ cd ..
$ cd ..
@@ -105,9 +104,9 @@
# testing echange of "O" (a9bdc8b26820)
## initial state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing "O" from main to pushdest
@@ -117,13 +116,13 @@
remote: 3 new obsolescence markers
## post push state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pulldest
## pulling "a9bdc8b26820" from main into pulldest
pulling from main
@@ -131,17 +130,17 @@
3 new obsolescence markers
## post pull state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pulldest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
Actual Test (bare push)
-------------------------------------
@@ -150,9 +149,9 @@
## Running testcase C.3.b
## initial state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing from main to pushdest
@@ -162,13 +161,13 @@
remote: 3 new obsolescence markers
## post push state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pulldest
## pulling from main into pulldest
pulling from main
@@ -177,14 +176,14 @@
3 new obsolescence markers
## post pull state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pulldest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
--- a/tests/test-exchange-obsmarkers-case-C4.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-C4.t Wed Mar 21 16:32:54 2018 +0100
@@ -65,7 +65,6 @@
$ mkcommit C
created new head
$ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'`
- obsoleted 1 changesets
$ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'`
$ hg prune -qd '0 0' .
$ hg log -G --hidden
@@ -80,21 +79,21 @@
$ inspect_obsmarkers
obsstore content
================
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (*) {'user': 'test'} (glob)
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (*) {'user': 'test'} (glob)
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
obshashtree
===========
- a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 a9c02d134f5b98acc74d1dc4eb28fd59f958a2bd
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 619b4d13bd9878f04d7208dcfcf1e89da826f6be
- 35b1839966785d5703a01607229eea932db42f87 ddeb7b7a87378f59cecb36d5146df0092b6b3327
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0ef78fef48a60c677f55ba6efa4126dab2d6caf2
+ a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 172c7e3f43e9982efc74a27d34bd7a54cc158b57
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 c195f40b705423f406e537d1c64f6bc131a80214
+ 35b1839966785d5703a01607229eea932db42f87 76197cf2f9c1dcf5baa6cc3f4057980055353c03
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed e0a3b65709a8a1938e6c6cfc49a45253849e31a2
obshashrange
============
rev node index size depth obshash
- 2 35b183996678 0 2 2 2a098b4a877f
+ 2 35b183996678 0 2 2 8d1b3b767a40
2 35b183996678 1 1 2 916e804c50de
- 0 a9bdc8b26820 0 1 1 a9c02d134f5b
+ 0 a9bdc8b26820 0 1 1 172c7e3f43e9
$ cd ..
$ cd ..
@@ -106,9 +105,9 @@
# testing echange of "O" (a9bdc8b26820)
## initial state
# obstore: main
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (*) {'user': 'test'} (glob)
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing "O" from main to pushdest
@@ -118,12 +117,12 @@
remote: 2 new obsolescence markers
## post push state
# obstore: main
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (*) {'user': 'test'} (glob)
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
## pulling "a9bdc8b26820" from main into pulldest
pulling from main
@@ -131,12 +130,12 @@
2 new obsolescence markers
## post pull state
# obstore: main
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (*) {'user': 'test'} (glob)
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (*) {'user': 'test'} (glob)
--- a/tests/test-exchange-obsmarkers-case-D1.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-D1.t Wed Mar 21 16:32:54 2018 +0100
@@ -61,7 +61,6 @@
$ mkcommit A1
created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
- obsoleted 1 changesets
$ hg prune -d '0 0' 'desc(B)'
1 changesets pruned
$ hg strip --hidden -q 'desc(A0)' --config devel.strip-obsmarkers=no
@@ -73,18 +72,18 @@
$ inspect_obsmarkers
obsstore content
================
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
obshashtree
===========
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 289cb0d058c81c763eca8bb438657dba9a7ba646
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 163059af30d498e215e86e1ead6ab749521c38be
obshashrange
============
rev node index size depth obshash
- 1 e5ea8f9c7314 0 2 2 289cb0d058c8
+ 1 e5ea8f9c7314 0 2 2 163059af30d4
0 a9bdc8b26820 0 1 1 000000000000
- 1 e5ea8f9c7314 1 1 2 289cb0d058c8
+ 1 e5ea8f9c7314 1 1 2 163059af30d4
$ cd ..
$ cd ..
@@ -99,8 +98,8 @@
# testing echange of "A1" (e5ea8f9c7314)
## initial state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing "A1" from main to pushdest
@@ -113,11 +112,11 @@
remote: 2 new obsolescence markers
## post push state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
## pulling "e5ea8f9c7314" from main into pulldest
pulling from main
@@ -130,14 +129,14 @@
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
Actual Test (base push)
---------------------------
@@ -146,8 +145,8 @@
## Running testcase D.1.b
## initial state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing from main to pushdest
@@ -160,11 +159,11 @@
remote: 2 new obsolescence markers
## post push state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
## pulling from main into pulldest
pulling from main
@@ -177,12 +176,12 @@
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
--- a/tests/test-exchange-obsmarkers-case-D2.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-D2.t Wed Mar 21 16:32:54 2018 +0100
@@ -54,7 +54,6 @@
$ mkcommit A1
created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
- obsoleted 1 changesets
$ hg prune --date '0 0' .
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at a9bdc8b26820
@@ -68,16 +67,16 @@
$ inspect_obsmarkers
obsstore content
================
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
obshashtree
===========
- a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 554c0b12f7d9fff20cb904c26e12eee337e3309c
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 5c81c58ce0a8ad61dd9cf4c6949846b5990af30d
+ a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 c14d90ad60c950e75009151899c742ce8cc9b2e6
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e08003a7b0ea2ec7ec7e07708d34cf3819aa8009
obshashrange
============
rev node index size depth obshash
- 0 a9bdc8b26820 0 1 1 554c0b12f7d9
+ 0 a9bdc8b26820 0 1 1 c14d90ad60c9
$ cd ..
$ cd ..
@@ -88,8 +87,8 @@
## Running testcase D.2
## initial state
# obstore: main
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing from main to pushdest
@@ -99,11 +98,11 @@
remote: 2 new obsolescence markers
## post push state
# obstore: main
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pulldest
## pulling from main into pulldest
pulling from main
@@ -112,12 +111,12 @@
2 new obsolescence markers
## post pull state
# obstore: main
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pulldest
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
--- a/tests/test-exchange-obsmarkers-case-D3.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-D3.t Wed Mar 21 16:32:54 2018 +0100
@@ -57,7 +57,6 @@
created new head
$ mkcommit A1
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
- obsoleted 1 changesets
$ hg prune -d '0 0' .
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 35b183996678
@@ -73,18 +72,18 @@
$ inspect_obsmarkers
obsstore content
================
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (*) {'user': 'test'} (glob)
+ 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (*) {'ef1': '*', 'user': 'test'} (glob)
obshashtree
===========
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000
- 35b1839966785d5703a01607229eea932db42f87 65a9f21dff0702355e973a8f31d3b3b7e59376fb
+ 35b1839966785d5703a01607229eea932db42f87 43ff2c20d850ad18dee0f7f252c98c1f1a0cfd5c
obshashrange
============
rev node index size depth obshash
- 2 35b183996678 0 2 2 65a9f21dff07
- 2 35b183996678 1 1 2 65a9f21dff07
+ 2 35b183996678 0 2 2 43ff2c20d850
+ 2 35b183996678 1 1 2 43ff2c20d850
0 a9bdc8b26820 0 1 1 000000000000
$ cd ..
$ cd ..
@@ -97,8 +96,8 @@
# testing echange of "O" (a9bdc8b26820)
## initial state
# obstore: main
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (*) {'user': 'test'} (glob)
+ 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing "O" from main to pushdest
@@ -107,8 +106,8 @@
no changes found
## post push state
# obstore: main
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (*) {'user': 'test'} (glob)
+ 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pulling "a9bdc8b26820" from main into pulldest
@@ -116,8 +115,8 @@
no changes found
## post pull state
# obstore: main
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (*) {'user': 'test'} (glob)
+ 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (*) {'ef1': '*', 'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
--- a/tests/test-exchange-obsmarkers-case-D4.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-D4.t Wed Mar 21 16:32:54 2018 +0100
@@ -59,10 +59,8 @@
created new head
$ mkcommit B1
$ hg debugobsolete `getid 'desc(A0)'` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- obsoleted 1 changesets
$ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A1)'`
$ hg debugobsolete `getid 'desc(B0)'` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
- obsoleted 1 changesets
$ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B1)'`
$ hg log -G --hidden
@ 069b05c3876d (draft): B1
@@ -78,10 +76,10 @@
$ inspect_obsmarkers
obsstore content
================
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (*) {'user': 'test'} (glob)
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (*) {'user': 'test'} (glob)
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (*) {'user': 'test'} (glob)
obshashtree
===========
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
@@ -108,10 +106,10 @@
# testing echange of "A1" (e5ea8f9c7314)
## initial state
# obstore: main
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (*) {'user': 'test'} (glob)
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (*) {'user': 'test'} (glob)
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
# obstore: pulldest
## pushing "A1" from main to pushdest
@@ -124,13 +122,13 @@
remote: 2 new obsolescence markers
## post push state
# obstore: main
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (*) {'user': 'test'} (glob)
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (*) {'user': 'test'} (glob)
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (*) {'user': 'test'} (glob)
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
## pulling "e5ea8f9c7314" from main into pulldest
pulling from main
@@ -143,13 +141,13 @@
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (*) {'user': 'test'} (glob)
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (*) {'user': 'test'} (glob)
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (*) {'user': 'test'} (glob)
# obstore: pushdest
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (*) {'user': 'test'} (glob)
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
# obstore: pulldest
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (*) {'user': 'test'} (glob)
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
--- a/tests/test-metaedit.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-metaedit.t Wed Mar 21 16:32:54 2018 +0100
@@ -174,15 +174,15 @@
@ a08d35fd7d9d (10) E
|\
x | 212b2a2b87cd (9) F
- | | rewritten as a08d35fd7d9d by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rewritten(description, user, parent, content) as a08d35fd7d9d by test (*) (glob)
| | note: folding changesets using metaedit
| |
| x c2bd843aa246 (7) E
- | rewritten as a08d35fd7d9d by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, content) as a08d35fd7d9d by test (*) (glob)
| note: folding changesets using metaedit
|
x 587528abfffe (8) F
- rewritten as 212b2a2b87cd by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(user) as 212b2a2b87cd by test (*) (glob)
no new commit is created here because the date is the same
--- a/tests/test-obsolete.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-obsolete.t Wed Mar 21 16:32:54 2018 +0100
@@ -33,9 +33,8 @@
$ getid 3
0d3f46688ccc6e756c7e96cf64c391c411309597
$ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597
- obsoleted 1 changesets
$ hg debugobsolete
- 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (*) {'user': 'test'} (glob)
Test hidden() revset
@@ -97,7 +96,6 @@
$ mkcommit "obsol_c'" # 4 (on 1)
created new head
$ hg debugobsolete `getid 3` `getid 4`
- obsoleted 1 changesets
$ qlog
4
- 725c380fe99b
@@ -128,7 +126,6 @@
parent: 1:7c3bad9141dc
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- obsolete: rewritten as 725c380fe99b
summary: add obsol_c
working directory parent is obsolete! (0d3f46688ccc)
@@ -212,7 +209,6 @@
created new head
1 new unstable changesets
$ hg debugobsolete `getid 5` `getid 6`
- obsoleted 1 changesets
$ qlog
6
- 95de7fc6918d
@@ -241,7 +237,6 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
1 new obsolescence markers
- obsoleted 1 changesets
$ qlog -R ../other-new
5
- 95de7fc6918d
@@ -271,7 +266,6 @@
created new head
1 new unstable changesets
$ hg debugobsolete `getid 6` `getid 7`
- obsoleted 1 changesets
$ hg pull -R ../other-new .
pulling from .
searching for changes
@@ -280,7 +274,6 @@
adding file changes
added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
1 new obsolescence markers
- obsoleted 1 changesets
(run 'hg heads' to see heads, 'hg merge' to merge)
$ qlog -R ../other-new
6
@@ -361,7 +354,6 @@
created new head
1 new unstable changesets
$ hg debugobsolete `getid 7` `getid 8`
- obsoleted 1 changesets
$ cd ../other-new
$ hg up -q 3
$ hg pull ../local/
@@ -372,7 +364,6 @@
adding file changes
added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
1 new obsolescence markers
- obsoleted 1 changesets
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up -q 7 # to check rollback update behavior
@@ -446,7 +437,6 @@
- 1f0dee641bb7
$ hg debugobsolete `getid 9` #kill
- obsoleted 1 changesets
$ hg up null -q # to be not based on 9 anymore
$ qlog
8
@@ -465,7 +455,6 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg up
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
- updated to "159dfc9fa5d3: add obsol_d''"
1 other heads for branch "default"
$ hg id -n
8
@@ -550,12 +539,10 @@
adding file changes
added 2 changesets with 1 changes to [12] files (re)
3 new obsolescence markers
- obsoleted 1 changesets
$ hg up -q 10
$ mkcommit "obsol_d'''"
created new head
$ hg debugobsolete `getid 11` `getid 12`
- obsoleted 1 changesets
$ hg push ../other-new --traceback
pushing to ../other-new
searching for changes
@@ -564,7 +551,6 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
1 new obsolescence markers
- obsoleted 1 changesets
$ cd ..
check bumped detection
@@ -653,17 +639,17 @@
summary: add a
$ hg debugobsolete | grep -v 33d458d86621f3186c40bfccd77652f4a122743e
- 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 0d3f46688ccc6e756c7e96cf64c391c411309597 725c380fe99b5e76613493f0903e8d11ddc70d54 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 1f0dee641bb7258c56bd60e93edfa2405381c41e 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'}
- 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'}
- 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'}
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (*) {'user': 'test'} (glob)
+ 0d3f46688ccc6e756c7e96cf64c391c411309597 725c380fe99b5e76613493f0903e8d11ddc70d54 0 (*) {'user': 'test'} (glob)
+ a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (*) {'user': 'test'} (glob)
+ 95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (*) {'user': 'test'} (glob)
+ 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (*) {'user': 'test'} (glob)
+ 1f0dee641bb7258c56bd60e93edfa2405381c41e 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (*) {'user': 'test'} (glob)
+ 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (*) {'user': 'test'} (glob)
+ 0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 (*) {'user': 'test'} (glob)
+ 0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (*) {'ef1': '*', 'user': 'test'} (glob)
#no produced by 2.3
33d458d86621f3186c40bfccd77652f4a122743e 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob)
@@ -707,11 +693,11 @@
[2]
$ hg olog
@ 0d3f46688ccc (3) add obsol_c
- | rewritten(parent) as 2033b4e49474 by test (Thu Jan 01 00:00:00 1970 +0000)
- | rewritten as 725c380fe99b by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(parent) as 2033b4e49474 by test (*) (glob)
+ | rewritten as 725c380fe99b by test (*) (glob)
|
x 4538525df7e2 (2) add c
- rewritten as 0d3f46688ccc by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten as 0d3f46688ccc by test (*) (glob)
Check import reports new unstable changeset:
@@ -753,14 +739,12 @@
| | | x changeset: 14:33d458d86621
| | | | user: test
| | | | date: Thu Jan 01 00:00:00 1970 +0000
- | | | | obsolete: pruned
| | | | summary: temporary amend commit for 0b1b6dd009c0
| | | |
| | | x changeset: 13:0b1b6dd009c0
| | |/ parent: 10:2033b4e49474
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
- | | | obsolete: amended as 705ab2a6b72e
| | | summary: add f
| | |
| | | o changeset: 12:6db5e282cb91
@@ -785,36 +769,30 @@
| | parent: -1:000000000000
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: pruned
| | summary: add toto
| |
| | x changeset: 8:159dfc9fa5d3
| | | parent: 3:0d3f46688ccc
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
- | | | obsolete: rebased as 9468a5f5d8b2
| | | summary: add obsol_d''
| | |
| | | x changeset: 7:909a0fb57e5d
| | |/ parent: 3:0d3f46688ccc
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
- | | | obsolete: rewritten as 159dfc9fa5d3
| | | summary: add obsol_d'
| | |
| | | x changeset: 6:95de7fc6918d
| | |/ parent: 3:0d3f46688ccc
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
- | | | obsolete: rewritten as 909a0fb57e5d
| | | summary: add obsol_d
| | |
| | | x changeset: 5:a7a6f2b5d8a5
| | |/ parent: 3:0d3f46688ccc
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
- | | | obsolete: rewritten as 95de7fc6918d
- | | | obsolete: rewritten as 50f11e5e3a63
| | | summary: add d
| | |
| o | changeset: 4:725c380fe99b
@@ -827,14 +805,11 @@
| |/ parent: 1:7c3bad9141dc
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: rewritten as 725c380fe99b
- | | obsolete: rebased as 2033b4e49474
| | summary: add obsol_c
| |
x | changeset: 2:4538525df7e2
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten as 0d3f46688ccc
| summary: add c
|
o changeset: 1:7c3bad9141dc
@@ -851,7 +826,7 @@
Simple rewrite
$ hg --hidden debugobsolete --rev 3
- 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (*) {'user': 'test'} (glob)
simple rewrite with a prune attached to it
@@ -862,7 +837,7 @@
Transitive rewrite
$ hg --hidden debugobsolete --rev 8
- 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (*) {'user': 'test'} (glob)
+ 95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (*) {'user': 'test'} (glob)
+ a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (*) {'user': 'test'} (glob)
--- a/tests/test-prune.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-prune.t Wed Mar 21 16:32:54 2018 +0100
@@ -57,7 +57,7 @@
$ hg bookmark
* BABAR 3:47d2a3944de8
$ hg debugobsolete
- 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'}
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob)
prune leaving instability behind
@@ -66,8 +66,8 @@
2 new unstable changesets
$ hg book -i BABAR
$ hg debugobsolete
- 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'}
- 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob)
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob)
pruning multiple changeset at once
@@ -78,10 +78,10 @@
[ ui.status|working directory now at [evolve.node|1f0dee641bb7]]
[ ui.status|2 changesets pruned]
$ hg debugobsolete
- 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'}
- 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob)
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'ef1': '*', 'user': 'test'} (glob)
cannot prune public changesets
@@ -90,10 +90,10 @@
(see 'hg help phases' for details)
[255]
$ hg debugobsolete
- 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'}
- 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob)
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'ef1': '*', 'user': 'test'} (glob)
Check successors addition
----------------------------
@@ -139,11 +139,11 @@
working directory now at 6e8148413dd5
1 changesets pruned
$ hg debugobsolete
- 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'}
- 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob)
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'ef1': '*', 'user': 'test'} (glob)
+ bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'ef1': '*', 'user': 'test'} (glob)
$ hg log -G
@ 12:6e8148413dd5[] (draft) add nE
|
@@ -170,12 +170,12 @@
$ hg prune 'desc("add dd")' -s 'desc("add nD")' -s 'desc("add nC")' --split
1 changesets pruned
$ hg debugobsolete
- 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'}
- 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob)
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'ef1': '*', 'user': 'test'} (glob)
+ bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (*) {'ef1': '*', 'user': 'test'} (glob)
$ hg log -G
@ 12:6e8148413dd5[] (draft) add nE
|
@@ -199,12 +199,12 @@
(use --biject to mark a series as a replacement for another)
[255]
$ hg debugobsolete
- 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'}
- 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob)
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'ef1': '*', 'user': 'test'} (glob)
+ bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (*) {'ef1': '*', 'user': 'test'} (glob)
two old, one new:
@@ -214,14 +214,14 @@
$ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nB")' --fold
2 changesets pruned
$ hg debugobsolete
- 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'}
- 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob)
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'ef1': '*', 'user': 'test'} (glob)
+ bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (*) {'ef1': '*', 'user': 'test'} (glob)
two old, two new with --biject
@@ -236,16 +236,16 @@
working directory now at 1f0dee641bb7
2 changesets pruned
$ hg debugobsolete
- 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'}
- 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- cb7f8f706a6532967b98cf8583a81baab79a0fa7 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 21b6f2f1cece8c10326e575dd38239189d467190 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob)
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'ef1': '*', 'user': 'test'} (glob)
+ bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ cb7f8f706a6532967b98cf8583a81baab79a0fa7 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 21b6f2f1cece8c10326e575dd38239189d467190 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'ef1': '*', 'user': 'test'} (glob)
test hg strip replacement
@@ -353,6 +353,7 @@
2 successors: 0
more than 2 successors: 0
available keys:
+ ef1: 7
user: 7
marker size:
format v1:
@@ -361,10 +362,10 @@
median length: * (glob)
mean length: * (glob)
format v0:
- smallest length: 90
- longer length: 90
- median length: 90
- mean length: 90
+ smallest length: * (glob)
+ longer length: * (glob)
+ median length: * (glob)
+ mean length: * (glob)
disconnected clusters: 7
any known node: 7
smallest length: 1
--- a/tests/test-push-checkheads-partial-C1.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-partial-C1.t Wed Mar 21 16:32:54 2018 +0100
@@ -57,7 +57,6 @@
$ mkcommit B1
created new head
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
- obsoleted 1 changesets
$ hg log -G --hidden
@ 25c56d33e4c4 (draft): B1
|
--- a/tests/test-push-checkheads-partial-C2.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-partial-C2.t Wed Mar 21 16:32:54 2018 +0100
@@ -59,7 +59,6 @@
$ mkcommit A1
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
- obsoleted 1 changesets
$ hg log -G --hidden
@ f6082bc4ffef (draft): A1
|
--- a/tests/test-push-checkheads-partial-C3.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-partial-C3.t Wed Mar 21 16:32:54 2018 +0100
@@ -59,7 +59,6 @@
$ mkcommit C0
created new head
$ hg debugobsolete --record-parents `getid "desc(B0)"`
- obsoleted 1 changesets
$ hg log -G --hidden
@ 0f88766e02d6 (draft): C0
|
--- a/tests/test-push-checkheads-partial-C4.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-partial-C4.t Wed Mar 21 16:32:54 2018 +0100
@@ -59,7 +59,6 @@
$ mkcommit C0
created new head
$ hg debugobsolete --record-parents `getid "desc(A0)"`
- obsoleted 1 changesets
$ hg log -G --hidden
@ 0f88766e02d6 (draft): C0
|
--- a/tests/test-push-checkheads-pruned-B1.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-pruned-B1.t Wed Mar 21 16:32:54 2018 +0100
@@ -49,7 +49,6 @@
$ mkcommit B0
created new head
$ hg debugobsolete --record-parents `getid "desc(A0)"`
- obsoleted 1 changesets
$ hg log -G --hidden
@ 74ff5441d343 (draft): B0
|
@@ -69,6 +68,5 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
1 new obsolescence markers
- obsoleted 1 changesets
$ cd ../..
--- a/tests/test-push-checkheads-pruned-B2.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-pruned-B2.t Wed Mar 21 16:32:54 2018 +0100
@@ -59,9 +59,7 @@
$ mkcommit A1
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
- obsoleted 1 changesets
$ hg debugobsolete --record-parents `getid "desc(B0)"`
- obsoleted 1 changesets
$ hg log -G --hidden
@ f6082bc4ffef (draft): A1
|
@@ -83,6 +81,5 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
2 new obsolescence markers
- obsoleted 2 changesets
$ cd ../..
--- a/tests/test-push-checkheads-pruned-B3.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-pruned-B3.t Wed Mar 21 16:32:54 2018 +0100
@@ -59,9 +59,7 @@
$ mkcommit B1
created new head
$ hg debugobsolete --record-parents `getid "desc(A0)"`
- obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
- obsoleted 1 changesets
$ hg log -G --hidden
@ 25c56d33e4c4 (draft): B1
|
@@ -83,7 +81,6 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
2 new obsolescence markers
- obsoleted 2 changesets
$ cd ../..
--- a/tests/test-push-checkheads-pruned-B4.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-pruned-B4.t Wed Mar 21 16:32:54 2018 +0100
@@ -60,9 +60,7 @@
$ mkcommit C0
created new head
$ hg debugobsolete --record-parents `getid "desc(A0)"`
- obsoleted 1 changesets
$ hg debugobsolete --record-parents `getid "desc(B0)"`
- obsoleted 1 changesets
$ hg log -G --hidden
@ 0f88766e02d6 (draft): C0
|
@@ -84,6 +82,5 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
2 new obsolescence markers
- obsoleted 2 changesets
$ cd ../..
--- a/tests/test-push-checkheads-pruned-B5.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-pruned-B5.t Wed Mar 21 16:32:54 2018 +0100
@@ -63,11 +63,8 @@
$ mkcommit B1
created new head
$ hg debugobsolete --record-parents `getid "desc(A0)"`
- obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"`
- obsoleted 1 changesets
$ hg debugobsolete --record-parents `getid "desc(C0)"`
- obsoleted 1 changesets
$ hg log -G --hidden
@ 25c56d33e4c4 (draft): B1
|
@@ -91,6 +88,5 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
3 new obsolescence markers
- obsoleted 3 changesets
$ cd ../..
--- a/tests/test-push-checkheads-pruned-B6.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-pruned-B6.t Wed Mar 21 16:32:54 2018 +0100
@@ -52,9 +52,7 @@
$ hg up 'desc(B0)'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`
- obsoleted 1 changesets
$ hg debugobsolete --record-parents `getid "desc(A1)"`
- obsoleted 1 changesets
$ hg log -G --hidden
x ba93660aff8d (draft): A1
|
@@ -76,6 +74,5 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
2 new obsolescence markers
- obsoleted 1 changesets
$ cd ../..
--- a/tests/test-push-checkheads-pruned-B7.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-pruned-B7.t Wed Mar 21 16:32:54 2018 +0100
@@ -51,9 +51,7 @@
$ hg up 'desc(B0)'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`
- obsoleted 1 changesets
$ hg debugobsolete --record-parents `getid "desc(A1)"`
- obsoleted 1 changesets
$ hg log -G --hidden
x ba93660aff8d (draft): A1
|
@@ -75,6 +73,5 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
2 new obsolescence markers
- obsoleted 1 changesets
$ cd ../..
--- a/tests/test-push-checkheads-pruned-B8.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-pruned-B8.t Wed Mar 21 16:32:54 2018 +0100
@@ -66,13 +66,9 @@
$ mkcommit A2
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
- obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
- obsoleted 1 changesets
$ hg debugobsolete --record-parents `getid "desc(B1)"`
- obsoleted 1 changesets
$ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"`
- obsoleted 1 changesets
$ hg log -G --hidden
@ c1f8d089020f (draft): A2
|
@@ -98,6 +94,5 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
4 new obsolescence markers
- obsoleted 2 changesets
$ cd ../..
--- a/tests/test-push-checkheads-superceed-A1.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-superceed-A1.t Wed Mar 21 16:32:54 2018 +0100
@@ -46,7 +46,6 @@
$ mkcommit A1
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
- obsoleted 1 changesets
$ hg log -G --hidden
@ f6082bc4ffef (draft): A1
|
@@ -66,6 +65,5 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
1 new obsolescence markers
- obsoleted 1 changesets
$ cd ../..
--- a/tests/test-push-checkheads-superceed-A2.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-superceed-A2.t Wed Mar 21 16:32:54 2018 +0100
@@ -59,9 +59,7 @@
created new head
$ mkcommit B1
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
- obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
- obsoleted 1 changesets
$ hg log -G --hidden
@ 262c8c798096 (draft): B1
|
@@ -85,6 +83,5 @@
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
2 new obsolescence markers
- obsoleted 2 changesets
$ cd ../..
--- a/tests/test-push-checkheads-superceed-A3.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-superceed-A3.t Wed Mar 21 16:32:54 2018 +0100
@@ -62,9 +62,7 @@
created new head
$ mkcommit A1
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
- obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
- obsoleted 1 changesets
$ hg log -G --hidden
@ c1c7524e9488 (draft): A1
|
@@ -88,6 +86,5 @@
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
2 new obsolescence markers
- obsoleted 2 changesets
$ cd ../..
--- a/tests/test-push-checkheads-superceed-A4.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-superceed-A4.t Wed Mar 21 16:32:54 2018 +0100
@@ -48,7 +48,6 @@
$ mkcommit A1
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
- obsoleted 1 changesets
$ mkcommit B0
$ hg log -G --hidden
@ f40ded968333 (draft): B0
@@ -71,6 +70,5 @@
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
1 new obsolescence markers
- obsoleted 1 changesets
$ cd ../../
--- a/tests/test-push-checkheads-superceed-A5.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-superceed-A5.t Wed Mar 21 16:32:54 2018 +0100
@@ -49,7 +49,6 @@
created new head
$ mkcommit A1
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
- obsoleted 1 changesets
$ hg log -G --hidden
@ ba93660aff8d (draft): A1
|
@@ -71,7 +70,6 @@
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
1 new obsolescence markers
- obsoleted 1 changesets
$ cd ../..
--- a/tests/test-push-checkheads-superceed-A6.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-superceed-A6.t Wed Mar 21 16:32:54 2018 +0100
@@ -68,9 +68,7 @@
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit B1
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
- obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
- obsoleted 1 changesets
$ hg log -G --hidden
@ d70a1f75a020 (draft): B1
|
@@ -96,6 +94,5 @@
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
2 new obsolescence markers
- obsoleted 2 changesets
$ cd ../..
--- a/tests/test-push-checkheads-superceed-A7.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-superceed-A7.t Wed Mar 21 16:32:54 2018 +0100
@@ -68,9 +68,7 @@
$ mkcommit B1
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
- obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
- obsoleted 1 changesets
$ hg log -G --hidden
@ 25c56d33e4c4 (draft): B1
|
@@ -96,6 +94,5 @@
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
2 new obsolescence markers
- obsoleted 2 changesets
$ cd ../..
--- a/tests/test-push-checkheads-superceed-A8.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-superceed-A8.t Wed Mar 21 16:32:54 2018 +0100
@@ -53,9 +53,7 @@
$ mkcommit A2
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
- obsoleted 1 changesets
$ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"`
- obsoleted 1 changesets
$ hg log -G --hidden
@ c1f8d089020f (draft): A2
|
@@ -77,6 +75,5 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
2 new obsolescence markers
- obsoleted 1 changesets
$ cd ../..
--- a/tests/test-push-checkheads-unpushed-D1.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-unpushed-D1.t Wed Mar 21 16:32:54 2018 +0100
@@ -49,7 +49,6 @@
$ mkcommit A1
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
- obsoleted 1 changesets
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit B0
--- a/tests/test-push-checkheads-unpushed-D2.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-unpushed-D2.t Wed Mar 21 16:32:54 2018 +0100
@@ -63,9 +63,7 @@
$ mkcommit A1
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
- obsoleted 1 changesets
$ hg debugobsolete --record-parents `getid "desc(B0)"`
- obsoleted 1 changesets
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit C0
--- a/tests/test-push-checkheads-unpushed-D3.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-unpushed-D3.t Wed Mar 21 16:32:54 2018 +0100
@@ -66,9 +66,7 @@
$ mkcommit B1
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
- obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
- obsoleted 1 changesets
$ hg log -G --hidden
@ 25c56d33e4c4 (draft): B1
|
--- a/tests/test-push-checkheads-unpushed-D4.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-unpushed-D4.t Wed Mar 21 16:32:54 2018 +0100
@@ -82,9 +82,7 @@
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit B1
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
- obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
- obsoleted 1 changesets
$ hg log -G --hidden
@ d70a1f75a020 (draft): B1
|
@@ -120,6 +118,5 @@
adding file changes
added 1 changesets with 1 changes to 1 files
1 new obsolescence markers
- obsoleted 1 changesets
$ cd ../..
--- a/tests/test-push-checkheads-unpushed-D5.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-unpushed-D5.t Wed Mar 21 16:32:54 2018 +0100
@@ -71,9 +71,7 @@
$ mkcommit B1
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
- obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
- obsoleted 1 changesets
$ hg log -G --hidden
@ 25c56d33e4c4 (draft): B1
|
@@ -105,6 +103,5 @@
adding file changes
added 1 changesets with 1 changes to 1 files
1 new obsolescence markers
- obsoleted 1 changesets
$ cd ../..
--- a/tests/test-push-checkheads-unpushed-D6.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-unpushed-D6.t Wed Mar 21 16:32:54 2018 +0100
@@ -56,9 +56,7 @@
$ mkcommit C0
created new head
$ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`
- obsoleted 1 changesets
$ hg debugobsolete --record-parents `getid "desc(A1)"`
- obsoleted 1 changesets
$ hg log -G --hidden
@ 0f88766e02d6 (draft): C0
|
--- a/tests/test-push-checkheads-unpushed-D7.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-push-checkheads-unpushed-D7.t Wed Mar 21 16:32:54 2018 +0100
@@ -65,11 +65,8 @@
$ mkcommit C0
created new head
$ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`
- obsoleted 1 changesets
$ hg debugobsolete `getid "desc(A1)"` `getid "desc(A2)"`
- obsoleted 1 changesets
$ hg debugobsolete --record-parents `getid "desc(A2)"`
- obsoleted 1 changesets
$ hg log -G --hidden
@ 0f88766e02d6 (draft): C0
|
@@ -95,6 +92,5 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
3 new obsolescence markers
- obsoleted 1 changesets
$ cd ../..
--- a/tests/test-sharing.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-sharing.t Wed Mar 21 16:32:54 2018 +0100
@@ -88,9 +88,7 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
2 new obsolescence markers
- obsoleted 1 changesets
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- updated to "60ffde5765c5: fix bug 37"
1 other heads for branch "default"
Figure SG03
@@ -122,7 +120,6 @@
$ cd ../test-repo
$ hg update
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- updated to "de6151c48e1c: fix bug 37"
1 other heads for branch "default"
$ hg shortlog --hidden -G
@ 4:de6151c48e1c draft fix bug 37
@@ -213,7 +210,6 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
2 new obsolescence markers
- obsoleted 1 changesets
updating bookmark bug15
$ hg -R ../review bookmarks
bug15 3:cbdfbd5a5db2
@@ -258,7 +254,6 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
2 new obsolescence markers
- obsoleted 1 changesets
updating bookmark featureX
Bob receives second review, amends, and pushes to public:
@@ -284,7 +279,6 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
2 new obsolescence markers
- obsoleted 1 changesets
updating bookmark featureX
$ hg -R ../review bookmarks
bug15 3:cbdfbd5a5db2
@@ -400,7 +394,6 @@
adding file changes
added 1 changesets with 0 changes to 1 files
1 new obsolescence markers
- obsoleted 1 changesets
updating bookmark bug15
Figure SG08: review and public changesets after Alice pushes.
--- a/tests/test-split.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-split.t Wed Mar 21 16:32:54 2018 +0100
@@ -92,9 +92,9 @@
no more change to split
$ hg debugobsolete
- 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'}
- 06be89dfe2ae447383f30a2984933352757b6fb4 0 {1334a80b33c3f9873edab728fbbcf500eab61d2e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
- d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (*) {'ef1': '8', 'user': 'test'} (glob)
+ 06be89dfe2ae447383f30a2984933352757b6fb4 0 {1334a80b33c3f9873edab728fbbcf500eab61d2e} (*) {'ef1': '0', 'user': 'test'} (glob)
+ d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (*) {'ef1': '13', 'user': 'test'} (glob)
$ hg log -G
@ changeset: 7:033b3f5ae73d
| tag: tip
@@ -212,12 +212,12 @@
$ hg debugobsolete
1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (*) {'ef1': '8', 'user': 'test'} (glob)
06be89dfe2ae447383f30a2984933352757b6fb4 0 {1334a80b33c3f9873edab728fbbcf500eab61d2e} (*) {'ef1': '0', 'user': 'test'} (glob)
- d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (*) {'ef1': '13', 'user': 'test'} (glob)
52149352b372d39b19127d5bd2d488b1b63f9f85 b434287e665ce757ee5463a965cb3d119ca9e893 0 (*) {'ef1': '9', 'user': 'test'} (glob)
7a4fc25a48a5797bb069563854455aecf738d8f2 0 {52149352b372d39b19127d5bd2d488b1b63f9f85} (*) {'ef1': '0', 'user': 'test'} (glob)
- 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b e2b4afde39803bd42bb1374b230fca1b1e8cc868 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 033b3f5ae73db67c10de938fb6f26b949aaef172 bb5e4f6020c74e7961a51fda635ea9df9b04dda8 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- b434287e665ce757ee5463a965cb3d119ca9e893 ead2066d1dbf14833fe1069df1b735e4e9468c40 1188c4216eba37f18a1de6558564601d00ff2143 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b e2b4afde39803bd42bb1374b230fca1b1e8cc868 0 (*) {'ef1': '4', 'user': 'test'} (glob)
+ 033b3f5ae73db67c10de938fb6f26b949aaef172 bb5e4f6020c74e7961a51fda635ea9df9b04dda8 0 (*) {'ef1': '4', 'user': 'test'} (glob)
+ b434287e665ce757ee5463a965cb3d119ca9e893 ead2066d1dbf14833fe1069df1b735e4e9468c40 1188c4216eba37f18a1de6558564601d00ff2143 0 (*) {'ef1': '13', 'user': 'test'} (glob)
$ hg evolve --all
move:[10] split1
atop:[13] split4
--- a/tests/test-stabilize-conflict.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-stabilize-conflict.t Wed Mar 21 16:32:54 2018 +0100
@@ -65,8 +65,8 @@
$ safesed 's/huit/eight/' babar
$ hg diff
diff -r 9d5daf8bd956 babar
- --- a/babar Thu Jan 01 00:00:00 1970 +0000
- +++ b/babar Thu Jan 01 00:00:00 1970 +0000
+ --- a/babar * (glob)
+ +++ b/babar * (glob)
@@ -5,6 +5,6 @@
cinq
six
@@ -152,7 +152,6 @@
|/ parent: 0:29ec1554cfaf
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: amended as e04690b09bc6
| summary: babar count up to ten
|
o changeset: 0:29ec1554cfaf
@@ -246,7 +245,6 @@
|/ parent: 0:29ec1554cfaf
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: amended as b20d08eea373
| summary: babar count up to ten
|
o changeset: 0:29ec1554cfaf
--- a/tests/test-stabilize-order.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-stabilize-order.t Wed Mar 21 16:32:54 2018 +0100
@@ -112,8 +112,8 @@
@@ -3,3 +3,4 @@
93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (*) {'ef1': '*', 'user': 'test'} (glob)
7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {93418d2c0979643ad446f621195e78720edb05b4} (*) {'ef1': '*', 'user': 'test'} (glob)
- 22619daeed78036f80fbd326b6852519c4f0c25e 81b8bbcd5892841efed41433d7a5e9df922396cb 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 22619daeed78036f80fbd326b6852519c4f0c25e 81b8bbcd5892841efed41433d7a5e9df922396cb 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (*) {'ef1': '*', 'user': 'test'} (glob)
[1]
@@ -149,7 +149,6 @@
|
o 0:c471ef929e6a@default(draft) addroot
-| |
$ hg up 9
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg evolve -v
@@ -221,7 +220,6 @@
| x changeset: 12:2256dae6521f
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded as f83a0bce03e4
| summary: addc
|
o changeset: 11:7a68bc4596ea
--- a/tests/test-stabilize-result.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-stabilize-result.t Wed Mar 21 16:32:54 2018 +0100
@@ -54,7 +54,7 @@
$ hg debugobsolete
102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (*) {'ef1': '*', 'user': 'test'} (glob)
c5727dbded3c3a6877cf60d6bb552a76812cb844 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'ef1': '*', 'user': 'test'} (glob)
- cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'ef1': '*', 'user': 'test'} (glob)
Test evolve with conflict
@@ -63,8 +63,8 @@
b
$ hg pdiff a
diff -r 07f494440405 a
- --- a/a Thu Jan 01 00:00:00 1970 +0000
- +++ b/a Thu Jan 01 00:00:00 1970 +0000
+ --- a/a * (glob)
+ +++ b/a * (glob)
@@ -1,1 +1,2 @@
a
+a
@@ -89,8 +89,8 @@
$ hg revert -r "orphan()" a
$ hg diff
diff -r 66719795a494 a
- --- a/a Thu Jan 01 00:00:00 1970 +0000
- +++ b/a Thu Jan 01 00:00:00 1970 +0000
+ --- a/a * (glob)
+ +++ b/a * (glob)
@@ -1,1 +1,3 @@
a
+a
--- a/tests/test-topic-change.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-topic-change.t Wed Mar 21 16:32:54 2018 +0100
@@ -302,7 +302,10 @@
$ hg glog
@ 34:c48d6d71b2d9 {}
- | Added h (book)
+ | Added h ()
+ |
+ | x 33:a24c31c35013 {watwat}
+ |/ Added h (book)
|
o 26:7c76c271395f {bar}
| Added g ()
@@ -334,7 +337,13 @@
changed topic on 1 changes
$ hg glog
@ 35:1b83d11095b9 {movebook}
- | Added h (book bookboo)
+ | Added h ()
+ |
+ | x 34:c48d6d71b2d9 {}
+ |/ Added h (bookboo)
+ |
+ | x 33:a24c31c35013 {watwat}
+ |/ Added h (book)
|
o 26:7c76c271395f {bar}
| Added g ()
@@ -378,7 +387,13 @@
| Added g ()
|
| o 35:1b83d11095b9 {movebook}
- | | Added h (book bookboo)
+ | | Added h ()
+ | |
+ | | x 34:c48d6d71b2d9 {}
+ | |/ Added h (bookboo)
+ | |
+ | | x 33:a24c31c35013 {watwat}
+ | |/ Added h (book)
| |
| x 26:7c76c271395f {bar}
|/ Added g ()
--- a/tests/test-topic-debugcb.t Wed Mar 21 16:18:31 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,316 +0,0 @@
-==================================================
-Test for `hg debugconvertbookmark` added by topics
-==================================================
-
- $ . "$TESTDIR/testlib/topic_setup.sh"
-
- $ cat << EOF >> $HGRCPATH
- > drawdag=$RUNTESTDIR/drawdag.py
- > [ui]
- > logtemplate = [{rev}:{node|short}] {desc|firstline}\n\
- > {if(bookmarks, " bookmark: {join(bookmarks,"\n bookmark:")}\n")}\
- > {if(topics, " topic: {topics}\n")}
- > EOF
-
-Setting up the things
----------------------
-
- $ hg init repo
- $ cd repo
- $ echo "Hello" > root
- $ hg commit -Aqm "root"
- $ hg phase --public .
- $ echo "Hello" > a
- $ hg commit -Aqm "First commit"
- $ echo "Hello" > b
- $ hg commit -Aqm "Second commit"
- $ hg bookmark "hellos"
- $ hg up 0 -q
- $ echo "Fix 1" > l
- $ hg commit -Aqm "Fixing first"
- $ echo "Fix 2" > m
- $ hg commit -Aqm "Fixing second"
- $ hg bookmark "secondfix"
-
- $ hg log -G
- @ [4:ec0e17135a94] Fixing second
- | bookmark: secondfix
- o [3:e05947b88d69] Fixing first
- |
- | o [2:f53d1144f925] Second commit
- | | bookmark: hellos
- | o [1:df1fd5e18154] First commit
- |/
- o [0:249055fcca50] root
-
-
-Generic tests
-=============
-
-Help for the command
---------------------
-
- $ hg help debugconvertbookmark
- hg debugcb [-b BOOKMARK] [--all]
-
- aliases: debugconvertbookmark
-
- Converts a bookmark to a topic with the same name.
-
- options:
-
- -b --bookmark VALUE bookmark to convert to topic
- --all convert all bookmarks to topics
-
- (some details hidden, use --verbose to show complete help)
-
-Running without any argument
-----------------------------
-
- $ hg debugconvertbookmark
- abort: you must specify either '--all' or '-b'
- [255]
-
-Changing a particular bookmark to topic
-=======================================
-
- $ hg debugconvertbookmark -b hellos
- changed topic to "hellos" on 2 revisions
- $ hg log -G
- o [6:98ae7930f6ed] Second commit
- | topic: hellos
- o [5:ff69f6ee4618] First commit
- | topic: hellos
- | @ [4:ec0e17135a94] Fixing second
- | | bookmark: secondfix
- | o [3:e05947b88d69] Fixing first
- |/
- o [0:249055fcca50] root
-
-
-Changing all bookmarks to topic
-===============================
-
-Simple test
------------
-
- $ hg debugconvertbookmark --all
- switching to topic secondfix
- changed topic to "secondfix" on 2 revisions
- $ hg log -G
- @ [8:5f0f9cc1979a] Fixing second
- | topic: secondfix
- o [7:f8ecbf3b10be] Fixing first
- | topic: secondfix
- | o [6:98ae7930f6ed] Second commit
- | | topic: hellos
- | o [5:ff69f6ee4618] First commit
- |/ topic: hellos
- o [0:249055fcca50] root
-
-
-Trying with multiple bookmarks on a single changeset
-----------------------------------------------------
-
- $ echo "multiple bookmarks" >> m
- $ hg commit -Aqm "Trying multiple bookmarks"
- $ hg bookmark book1
- $ hg bookmark book2
- $ hg log -G
- @ [9:4ad3e7d421d4] Trying multiple bookmarks
- | bookmark: book1
- | bookmark:book2
- | topic: secondfix
- o [8:5f0f9cc1979a] Fixing second
- | topic: secondfix
- o [7:f8ecbf3b10be] Fixing first
- | topic: secondfix
- | o [6:98ae7930f6ed] Second commit
- | | topic: hellos
- | o [5:ff69f6ee4618] First commit
- |/ topic: hellos
- o [0:249055fcca50] root
-
- $ hg debugconvertbookmark --all
- skipping '9' as it has multiple bookmarks on it
- $ hg log -G
- @ [9:4ad3e7d421d4] Trying multiple bookmarks
- | bookmark: book1
- | bookmark:book2
- | topic: secondfix
- o [8:5f0f9cc1979a] Fixing second
- | topic: secondfix
- o [7:f8ecbf3b10be] Fixing first
- | topic: secondfix
- | o [6:98ae7930f6ed] Second commit
- | | topic: hellos
- | o [5:ff69f6ee4618] First commit
- |/ topic: hellos
- o [0:249055fcca50] root
-
-
-Two bookmarks on two different topological branches
----------------------------------------------------
-
- $ cd ..
- $ rm -rf repo
- $ hg init setup1
- $ cd setup1
- $ echo "Hello" > root
- $ hg commit -Aqm "root"
- $ hg phase --public .
- $ echo "Hello" > A
- $ hg commit -Aqm "A"
- $ echo "Hello" > B
- $ hg commit -Aqm "B"
- $ echo "Hello" > C
- $ hg commit -Aqm "C"
- $ echo "Hello" > D
- $ hg commit -Aqm "D"
- $ hg up 'desc(B)'
- 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
- $ echo "Hello" > E
- $ hg commit -Aqm "E"
- $ echo "Hello" > F
- $ hg commit -Aqm "F"
- $ hg bookmark -r 'desc(D)' bar
- $ hg bookmark -r 'desc(F)' foo
-
- $ hg log -G
- @ [6:32f4660df717] F
- | bookmark: foo
- o [5:d4608d9df75e] E
- |
- | o [4:4963af405f62] D
- | | bookmark: bar
- | o [3:ac05e0d05d00] C
- |/
- o [2:10f317d09e78] B
- |
- o [1:e34122c9a2bf] A
- |
- o [0:249055fcca50] root
-
- $ hg debugconvertbookmark --all
- changed topic to "bar" on 2 revisions
- switching to topic foo
- changed topic to "foo" on 2 revisions
- $ hg log -G
- @ [10:f0b5f2a5f31a] F
- | topic: foo
- o [9:7affa1350ff0] E
- | topic: foo
- | o [8:a1bb64d88f0e] D
- | | topic: bar
- | o [7:71827f564e9e] C
- |/ topic: bar
- o [2:10f317d09e78] B
- |
- o [1:e34122c9a2bf] A
- |
- o [0:249055fcca50] root
-
-
-Two bookmarks on top of each other
-----------------------------------
-
- $ cd ..
- $ rm -rf setup1
- $ hg init setup2
- $ cd setup2
- $ echo "Hello" > root
- $ hg commit -Aqm "root"
- $ hg phase --public .
- $ echo "Hello" > A
- $ hg commit -Aqm "A"
- $ hg phase --public .
- $ echo "Hello" > B
- $ hg commit -Aqm "B"
- $ echo "Hello" > C
- $ hg commit -Aqm "C"
- $ hg bookmark -r . bar
- $ echo "Hello" > D
- $ hg commit -Aqm "D"
- $ echo "Hello" > E
- $ hg commit -Aqm "E"
- $ hg bookmark -r . foo
-
- $ hg log -G
- @ [5:c633aa1ad270] E
- | bookmark: foo
- o [4:4963af405f62] D
- |
- o [3:ac05e0d05d00] C
- | bookmark: bar
- o [2:10f317d09e78] B
- |
- o [1:e34122c9a2bf] A
- |
- o [0:249055fcca50] root
-
-
-XXX: this should avoid create orphan changesets.
-
- $ hg debugconvertbookmark --all
- changed topic to "bar" on 2 revisions
- switching to topic foo
- changed topic to "foo" on 2 revisions
-
- $ hg log -G
- @ [9:b14d13efcfa7] E
- | topic: foo
- o [8:c89ca6e70978] D
- | topic: foo
- | o [7:a3ea0dfe6a10] C
- | | topic: bar
- | o [6:db1bc6aab480] B
- | | topic: bar
- x | [3:ac05e0d05d00] C
- | |
- x | [2:10f317d09e78] B
- |/
- o [1:e34122c9a2bf] A
- |
- o [0:249055fcca50] root
-
-
-Check that phase are properly take in account
----------------------------------------------
-
-(we reuse above test, taking advantage of a small bug regarding stacked bookmarks. we can fuse the two tests once that bug is fixed)
-
- $ cd ..
- $ hg init setup-phases
- $ cd setup-phases
- $ echo "Hello" > root
- $ hg commit -Aqm "root"
- $ hg phase --public .
- $ echo "Hello" > A
- $ hg commit -Aqm "A"
- $ echo "Hello" > B
- $ hg commit -Aqm "B"
- $ echo "Hello" > C
- $ hg commit -Aqm "C"
- $ hg bookmark -r . bar
- $ hg log -G
- @ [3:ac05e0d05d00] C
- | bookmark: bar
- o [2:10f317d09e78] B
- |
- o [1:e34122c9a2bf] A
- |
- o [0:249055fcca50] root
-
-
- $ hg debugconvertbookmark --all
- switching to topic bar
- changed topic to "bar" on 3 revisions
- $ hg log -G
- @ [6:863c43a7951c] C
- | topic: bar
- o [5:ac7f12ac947f] B
- | topic: bar
- o [4:fc82c8c14b4c] A
- | topic: bar
- o [0:249055fcca50] root
-
--- a/tests/test-topic-flow-single-head.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-topic-flow-single-head.t Wed Mar 21 16:32:54 2018 +0100
@@ -187,4 +187,3 @@
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)
1 new obsolescence markers
- obsoleted 1 changesets
--- a/tests/test-topic-stack-complex.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-topic-stack-complex.t Wed Mar 21 16:32:54 2018 +0100
@@ -9,6 +9,8 @@
> evolution = all
> [ui]
> interactive = True
+ > [defaults]
+ > split = -d "0 "0
> [extensions]
> show =
> EOF
@@ -32,9 +34,9 @@
$ echo f > f
$ hg ci -Aqm "Added e and f"
$ hg show work
- @ f1d36 (foo) Added e and f
- o 8e825 (foo) Added c and d
- o 002b8 (foo) Added a and b
+ @ f1d36 Added e and f
+ o 8e825 Added c and d
+ o 002b8 Added a and b
o f3603 Added foo
Testing in case of split within the topic
@@ -92,12 +94,12 @@
t0^ Added foo (base)
$ hg show work
- @ 5ccee (foo) split2
- o f26c1 (foo) split1
- | o f1d36 (foo) Added e and f
- | x 8e825 (foo) Added c and d
+ @ 5ccee split2
+ o f26c1 split1
+ | o f1d36 Added e and f
+ | x 8e825 Added c and d
|/
- o 002b8 (foo) Added a and b
+ o 002b8 Added a and b
o f3603 Added foo
$ hg prev
@@ -107,7 +109,7 @@
$ hg diff
diff -r f26c1b9addde c
--- a/c Thu Jan 01 00:00:00 1970 +0000
- +++ b/c Thu Jan 01 00:00:00 1970 +0000
+ +++ b/c * (glob)
@@ -1,1 +1,1 @@
-c
+foo
@@ -115,14 +117,14 @@
$ hg amend
1 new unstable changesets
$ hg show work
- @ 7d944 (foo) split1
- | o 5ccee (foo) split2
- | x f26c1 (foo) split1
+ @ 7d944 split1
+ | o 5ccee split2
+ | x f26c1 split1
|/
- | o f1d36 (foo) Added e and f
- | x 8e825 (foo) Added c and d
+ | o f1d36 Added e and f
+ | x 8e825 Added c and d
|/
- o 002b8 (foo) Added a and b
+ o 002b8 Added a and b
o f3603 Added foo
$ hg stack
--- a/tests/test-topic-stack.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-topic-stack.t Wed Mar 21 16:32:54 2018 +0100
@@ -832,7 +832,7 @@
t2@ c_G (current)
t1: c_D
t0^ c_A (base)
- $ hg --config extensions.evolve= --config ui.interactive=yes split << EOF
+ $ hg --config extensions.evolve= --config ui.interactive=yes split --date '0 0' << EOF
> y
> y
> n
@@ -861,16 +861,16 @@
| @ e7ea874afbd5 (23) c_G
|/
x b24bab30ac12 (21) c_G
- | rewritten as dde94df880e9, e7ea874afbd5 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(parent, content) as dde94df880e9, e7ea874afbd5 by test (*) (glob)
|
x 907f7d3c2333 (18) c_G
- | rewritten as b24bab30ac12 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten as b24bab30ac12 by test (*) (glob)
|
x 3ab2eedae500 (13) c_G
- | rewritten as 907f7d3c2333 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten as 907f7d3c2333 by test (*) (glob)
|
x c7d60a180d05 (6) c_G
- rewritten as 3ab2eedae500 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten as 3ab2eedae500 by test (*) (glob)
$ hg export .
# HG changeset patch
--- a/tests/test-topic-tutorial.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-topic-tutorial.t Wed Mar 21 16:32:54 2018 +0100
@@ -1239,7 +1239,6 @@
|/ topic: tools
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded as b7509bd417f8
| summary: Adding hammer
|
o changeset: 12:fbff9bc37a43
--- a/tests/test-topic.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-topic.t Wed Mar 21 16:32:54 2018 +0100
@@ -654,7 +654,7 @@
t0^ Add file delta (base current)
$ hg topics --age
- * fran (1970-01-01 by test)
+ * fran (* by test) (glob)
$ cd ..
@@ -702,11 +702,11 @@
$ hg add b
$ hg topic topic1990
- $ hg ci -m "Added b" --config devel.default-date="631152000 0" --user "foo"
+ $ hg ci -m "Added b" --config devel.default-date="631152000 0" --user "foo" --date "631152000 0"
active topic 'topic1990' grew its first changeset
$ hg add c
$ hg topic topic2010
- $ hg ci -m "Added c" --config devel.default-date="1262304000 0" --user "bar"
+ $ hg ci -m "Added c" --config devel.default-date="1262304000 0" --user "bar" --date "1262304000 0"
active topic 'topic2010' grew its first changeset
$ hg log -G
@@ -736,18 +736,18 @@
* topic2010 (1 changesets)
$ hg topics --age
- * topic2010 (2010-01-01 by bar)
- topic1990 (1990-01-01 by foo)
- topic1970 (1970-01-01 by test)
+ topic1970 (* by test) (glob)
+ * topic2010 (* by bar) (glob)
+ topic1990 (* by foo) (glob)
$ hg up topic1970
switching to topic topic1970
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg topics --age
- topic2010 (2010-01-01 by bar)
- topic1990 (1990-01-01 by foo)
- * topic1970 (1970-01-01 by test)
+ * topic1970 (* by test) (glob)
+ topic2010 (* by bar) (glob)
+ topic1990 (* by foo) (glob)
$ hg topics --age random
abort: cannot use --age while setting a topic
--- a/tests/test-touch.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-touch.t Wed Mar 21 16:32:54 2018 +0100
@@ -127,6 +127,6 @@
1 new unstable changesets
$ hg obslog -r 14 --hidden
x [0-9a-f]{12} (.*) move (re)
- pruned by test (Thu Jan 01 00:00:00 1970 +0000)
+ pruned by test (*) (glob)
rewritten(.*) as [0-9a-f]{12} by test (.*) (re)
--- a/tests/test-tutorial.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-tutorial.t Wed Mar 21 16:32:54 2018 +0100
@@ -997,7 +997,9 @@
But at the same time, locally, this same "bathroom changeset" was updated.
$ cd ../local
- $ hg up 4710c0968793 -q
+ $ hg up 75954b8cd933 -q
+ abort: unknown revision '75954b8cd933'!
+ [255]
$ sed -i'' -e 's/... More bathroom stuff to come/Bath Robe/' shopping
$ hg commit --amend
$ hg log -G
@@ -1204,7 +1206,6 @@
adding file changes
added 2 changesets with 2 changes to 1 files (+1 heads)
3 new obsolescence markers
- obsoleted 2 changesets
Remote get a warning that current working directory is based on an obsolete
changeset.
--- a/tests/test-uncommit-interactive.t Wed Mar 21 16:18:31 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,921 +0,0 @@
-================================================
-|| The test for `hg uncommit --interactive` ||
-================================================
-
-Repo Setup
-============
-
- $ . $TESTDIR/testlib/common.sh
- $ cat >> $HGRCPATH <<EOF
- > [ui]
- > interactive = true
- > [extensions]
- > evolve =
- > EOF
-
- $ glog() {
- > hg log -G --template '{rev}:{node|short}@{branch}({separate("/", obsolete, phase)}) {desc|firstline}\n' "$@"
- > }
-
- $ hg init repo
- $ cd repo
-
- $ touch a
- $ cat >> a << EOF
- > 1
- > 2
- > 3
- > 4
- > 5
- > EOF
-
- $ hg add a
- $ hg ci -m "The base commit"
-
-Make sure aborting the interactive selection does no magic
-----------------------------------------------------------
-
- $ hg status
- $ hg uncommit -i<<EOF
- > q
- > EOF
- diff --git a/a b/a
- new file mode 100644
- examine changes to 'a'? [Ynesfdaq?] q
-
- abort: user quit
- [255]
- $ hg status
-
-Make a commit with multiple hunks
----------------------------------
-
- $ cat > a << EOF
- > -2
- > -1
- > 0
- > 1
- > 2
- > 3
- > foo
- > bar
- > 4
- > 5
- > babar
- > EOF
-
- $ hg diff
- diff -r 7733902a8d94 a
- --- a/a Thu Jan 01 00:00:00 1970 +0000
- +++ b/a Thu Jan 01 00:00:00 1970 +0000
- @@ -1,5 +1,11 @@
- +-2
- +-1
- +0
- 1
- 2
- 3
- +foo
- +bar
- 4
- 5
- +babar
-
- $ hg ci -m "another one"
-
-Not selecting anything to uncommit
-==================================
-
- $ hg uncommit -i<<EOF
- > y
- > n
- > n
- > n
- > EOF
- diff --git a/a b/a
- 3 hunks, 6 lines changed
- examine changes to 'a'? [Ynesfdaq?] y
-
- @@ -1,3 +1,6 @@
- +-2
- +-1
- +0
- 1
- 2
- 3
- discard change 1/3 to 'a'? [Ynesfdaq?] n
-
- @@ -1,5 +4,7 @@
- 1
- 2
- 3
- +foo
- +bar
- 4
- 5
- discard change 2/3 to 'a'? [Ynesfdaq?] n
-
- @@ -4,2 +9,3 @@
- 4
- 5
- +babar
- discard change 3/3 to 'a'? [Ynesfdaq?] n
-
- abort: nothing selected to uncommit
- [255]
- $ hg status
-
-Uncommit a chunk
-================
-
- $ hg amend --extract -n "note on amend --extract" -i<<EOF
- > y
- > y
- > n
- > n
- > EOF
- current hg version does not support storing note in obsmarker
- current hg version does not support storing note in obsmarker
- diff --git a/a b/a
- 3 hunks, 6 lines changed
- examine changes to 'a'? [Ynesfdaq?] y
-
- @@ -1,3 +1,6 @@
- +-2
- +-1
- +0
- 1
- 2
- 3
- discard change 1/3 to 'a'? [Ynesfdaq?] y
-
- @@ -1,5 +4,7 @@
- 1
- 2
- 3
- +foo
- +bar
- 4
- 5
- discard change 2/3 to 'a'? [Ynesfdaq?] n
-
- @@ -4,2 +9,3 @@
- 4
- 5
- +babar
- discard change 3/3 to 'a'? [Ynesfdaq?] n
-
-
- $ hg obslog
- @ 678a59e5ff90 (3) another one
- |
- x f70fb463d5bf (1) another one
- rewritten as 678a59e5ff90 by test (Thu Jan 01 00:00:00 1970 +0000)
- note: note on amend --extract
-
-The unselected part should be in the diff
------------------------------------------
-
- $ hg diff
- diff -r 678a59e5ff90 a
- --- a/a Thu Jan 01 00:00:00 1970 +0000
- +++ b/a Thu Jan 01 00:00:00 1970 +0000
- @@ -1,3 +1,6 @@
- +-2
- +-1
- +0
- 1
- 2
- 3
-
-The commit should contain the rest of part
-------------------------------------------
-
- $ hg exp
- # HG changeset patch
- # User test
- # Date 0 0
- # Thu Jan 01 00:00:00 1970 +0000
- # Node ID 678a59e5ff90754d5e94719bd82ad169be773c21
- # Parent 7733902a8d94c789ca81d866bea1893d79442db6
- another one
-
- diff -r 7733902a8d94 -r 678a59e5ff90 a
- --- a/a Thu Jan 01 00:00:00 1970 +0000
- +++ b/a Thu Jan 01 00:00:00 1970 +0000
- @@ -1,5 +1,8 @@
- 1
- 2
- 3
- +foo
- +bar
- 4
- 5
- +babar
-
-Uncommiting on dirty working directory
-======================================
-
- $ hg status
- M a
- $ hg diff
- diff -r 678a59e5ff90 a
- --- a/a Thu Jan 01 00:00:00 1970 +0000
- +++ b/a Thu Jan 01 00:00:00 1970 +0000
- @@ -1,3 +1,6 @@
- +-2
- +-1
- +0
- 1
- 2
- 3
-
- $ hg uncommit -n "testing uncommit on dirty wdir" -i<<EOF
- > y
- > n
- > y
- > EOF
- current hg version does not support storing note in obsmarker
- diff --git a/a b/a
- 2 hunks, 3 lines changed
- examine changes to 'a'? [Ynesfdaq?] y
-
- @@ -1,5 +1,7 @@
- 1
- 2
- 3
- +foo
- +bar
- 4
- 5
- discard change 1/2 to 'a'? [Ynesfdaq?] n
-
- @@ -4,2 +6,3 @@
- 4
- 5
- +babar
- discard change 2/2 to 'a'? [Ynesfdaq?] y
-
- patching file a
- Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines).
-
- $ hg diff
- diff -r 46e35360be47 a
- --- a/a Thu Jan 01 00:00:00 1970 +0000
- +++ b/a Thu Jan 01 00:00:00 1970 +0000
- @@ -1,3 +1,6 @@
- +-2
- +-1
- +0
- 1
- 2
- 3
- @@ -5,3 +8,4 @@
- bar
- 4
- 5
- +babar
-
- $ hg exp
- # HG changeset patch
- # User test
- # Date 0 0
- # Thu Jan 01 00:00:00 1970 +0000
- # Node ID 46e35360be473bf761bedf3d05de4a68ffd9d9f8
- # Parent 7733902a8d94c789ca81d866bea1893d79442db6
- another one
-
- diff -r 7733902a8d94 -r 46e35360be47 a
- --- a/a Thu Jan 01 00:00:00 1970 +0000
- +++ b/a Thu Jan 01 00:00:00 1970 +0000
- @@ -1,5 +1,7 @@
- 1
- 2
- 3
- +foo
- +bar
- 4
- 5
-
-Checking the obsolescence history
-
- $ hg obslog
- @ 46e35360be47 (5) another one
- |
- x 678a59e5ff90 (3) another one
- | rewritten as 46e35360be47 by test (Thu Jan 01 00:00:00 1970 +0000)
- | note: testing uncommit on dirty wdir
- |
- x f70fb463d5bf (1) another one
- rewritten as 678a59e5ff90 by test (Thu Jan 01 00:00:00 1970 +0000)
- note: note on amend --extract
-
-
-Push the changes back to the commit and more commits for more testing
-
- $ hg amend
- $ glog
- @ 7:905eb2a23ea2@default(draft) another one
- |
- o 0:7733902a8d94@default(draft) The base commit
-
- $ touch foo
- $ echo "hey" >> foo
- $ hg ci -Am "Added foo"
- adding foo
-
-Testing uncommiting a whole changeset and also for a file addition
-==================================================================
-
- $ hg uncommit -i<<EOF
- > y
- > y
- > EOF
- diff --git a/foo b/foo
- new file mode 100644
- examine changes to 'foo'? [Ynesfdaq?] y
-
- @@ -0,0 +1,1 @@
- +hey
- discard this change to 'foo'? [Ynesfdaq?] y
-
- new changeset is empty
- (use 'hg prune .' to remove it)
-
- $ hg status
- A foo
- $ hg diff
- diff -r 857367499298 foo
- --- /dev/null Thu Jan 01 00:00:00 1970 +0000
- +++ b/foo Thu Jan 01 00:00:00 1970 +0000
- @@ -0,0 +1,1 @@
- +hey
-
- $ hg exp
- # HG changeset patch
- # User test
- # Date 0 0
- # Thu Jan 01 00:00:00 1970 +0000
- # Node ID 857367499298e999b5841bb01df65f73088b5d3b
- # Parent 905eb2a23ea2d92073419d0e19165b90d36ea223
- Added foo
-
- $ hg amend
-
-Testing to uncommit removed files completely
-============================================
-
- $ hg rm a
- $ hg ci -m "Removed a"
- $ hg exp
- # HG changeset patch
- # User test
- # Date 0 0
- # Thu Jan 01 00:00:00 1970 +0000
- # Node ID 219cfe20964e93f8bb9bd82ceaa54d3b776046db
- # Parent 42cc15efbec26c14d96d805dee2766ba91d1fd31
- Removed a
-
- diff -r 42cc15efbec2 -r 219cfe20964e a
- --- a/a Thu Jan 01 00:00:00 1970 +0000
- +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
- @@ -1,11 +0,0 @@
- --2
- --1
- -0
- -1
- -2
- -3
- -foo
- -bar
- -4
- -5
- -babar
-
-Not examining the file
-----------------------
-
- $ hg uncommit -i<<EOF
- > n
- > EOF
- diff --git a/a b/a
- deleted file mode 100644
- examine changes to 'a'? [Ynesfdaq?] n
-
- abort: nothing selected to uncommit
- [255]
-
-Examining the file
-------------------
-XXX: there is a bug in interactive selection as it is not letting to examine the
-file. Tried with curses too. In the curses UI, if you just unselect the hunks
-and the not file mod thing at the top, it will show the same "nothing unselected
-to uncommit" message which is a bug in interactive selection.
-
- $ hg uncommit -i<<EOF
- > y
- > EOF
- diff --git a/a b/a
- deleted file mode 100644
- examine changes to 'a'? [Ynesfdaq?] y
-
- new changeset is empty
- (use 'hg prune .' to remove it)
-
- $ hg diff
- diff -r 737487f1e5f8 a
- --- a/a Thu Jan 01 00:00:00 1970 +0000
- +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
- @@ -1,11 +0,0 @@
- --2
- --1
- -0
- -1
- -2
- -3
- -foo
- -bar
- -4
- -5
- -babar
- $ hg status
- R a
- $ hg exp
- # HG changeset patch
- # User test
- # Date 0 0
- # Thu Jan 01 00:00:00 1970 +0000
- # Node ID 737487f1e5f853e55decb73ea31522c63e7f5980
- # Parent 42cc15efbec26c14d96d805dee2766ba91d1fd31
- Removed a
-
-
- $ hg prune .
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory now at 42cc15efbec2
- 1 changesets pruned
- $ hg revert --all
- undeleting a
-
- $ glog
- @ 12:42cc15efbec2@default(draft) Added foo
- |
- o 7:905eb2a23ea2@default(draft) another one
- |
- o 0:7733902a8d94@default(draft) The base commit
-
-
-Testing when a new file is added in the last commit
-===================================================
-
- $ echo "foo" >> foo
- $ touch x
- $ echo "abcd" >> x
- $ hg add x
- $ hg ci -m "Added x"
- $ hg uncommit -i<<EOF
- > y
- > y
- > y
- > n
- > EOF
- diff --git a/foo b/foo
- 1 hunks, 1 lines changed
- examine changes to 'foo'? [Ynesfdaq?] y
-
- @@ -1,1 +1,2 @@
- hey
- +foo
- discard change 1/2 to 'foo'? [Ynesfdaq?] y
-
- diff --git a/x b/x
- new file mode 100644
- examine changes to 'x'? [Ynesfdaq?] y
-
- @@ -0,0 +1,1 @@
- +abcd
- discard change 2/2 to 'x'? [Ynesfdaq?] n
-
-
- $ hg exp
- # HG changeset patch
- # User test
- # Date 0 0
- # Thu Jan 01 00:00:00 1970 +0000
- # Node ID 25a080d13cb23dbd014839f54d99a96e57ba7e9b
- # Parent 42cc15efbec26c14d96d805dee2766ba91d1fd31
- Added x
-
- diff -r 42cc15efbec2 -r 25a080d13cb2 x
- --- /dev/null Thu Jan 01 00:00:00 1970 +0000
- +++ b/x Thu Jan 01 00:00:00 1970 +0000
- @@ -0,0 +1,1 @@
- +abcd
-
- $ hg diff
- diff -r 25a080d13cb2 foo
- --- a/foo Thu Jan 01 00:00:00 1970 +0000
- +++ b/foo Thu Jan 01 00:00:00 1970 +0000
- @@ -1,1 +1,2 @@
- hey
- +foo
-
- $ hg status
- M foo
-
- $ hg revert --all
- reverting foo
-
-Testing between the stack and with dirty working copy
-=====================================================
-
- $ glog
- @ 18:25a080d13cb2@default(draft) Added x
- |
- o 12:42cc15efbec2@default(draft) Added foo
- |
- o 7:905eb2a23ea2@default(draft) another one
- |
- o 0:7733902a8d94@default(draft) The base commit
-
- $ hg up 905eb2a23ea2
- 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-
- $ touch bar
- $ echo "foo" >> bar
- $ hg add bar
- $ hg status
- A bar
- ? foo.orig
-
- $ hg exp
- # HG changeset patch
- # User test
- # Date 0 0
- # Thu Jan 01 00:00:00 1970 +0000
- # Node ID 905eb2a23ea2d92073419d0e19165b90d36ea223
- # Parent 7733902a8d94c789ca81d866bea1893d79442db6
- another one
-
- diff -r 7733902a8d94 -r 905eb2a23ea2 a
- --- a/a Thu Jan 01 00:00:00 1970 +0000
- +++ b/a Thu Jan 01 00:00:00 1970 +0000
- @@ -1,5 +1,11 @@
- +-2
- +-1
- +0
- 1
- 2
- 3
- +foo
- +bar
- 4
- 5
- +babar
-
- $ hg uncommit -i<<EOF
- > y
- > n
- > n
- > y
- > EOF
- diff --git a/a b/a
- 3 hunks, 6 lines changed
- examine changes to 'a'? [Ynesfdaq?] y
-
- @@ -1,3 +1,6 @@
- +-2
- +-1
- +0
- 1
- 2
- 3
- discard change 1/3 to 'a'? [Ynesfdaq?] n
-
- @@ -1,5 +4,7 @@
- 1
- 2
- 3
- +foo
- +bar
- 4
- 5
- discard change 2/3 to 'a'? [Ynesfdaq?] n
-
- @@ -4,2 +9,3 @@
- 4
- 5
- +babar
- discard change 3/3 to 'a'? [Ynesfdaq?] y
-
- patching file a
- Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines).
- 2 new unstable changesets
-
- $ hg diff
- diff -r 676366511f95 a
- --- a/a Thu Jan 01 00:00:00 1970 +0000
- +++ b/a Thu Jan 01 00:00:00 1970 +0000
- @@ -8,3 +8,4 @@
- bar
- 4
- 5
- +babar
- diff -r 676366511f95 bar
- --- /dev/null Thu Jan 01 00:00:00 1970 +0000
- +++ b/bar Thu Jan 01 00:00:00 1970 +0000
- @@ -0,0 +1,1 @@
- +foo
-
- $ hg exp
- # HG changeset patch
- # User test
- # Date 0 0
- # Thu Jan 01 00:00:00 1970 +0000
- # Node ID 676366511f95ca4122413dcf79b45eaab61fb387
- # Parent 7733902a8d94c789ca81d866bea1893d79442db6
- another one
-
- diff -r 7733902a8d94 -r 676366511f95 a
- --- a/a Thu Jan 01 00:00:00 1970 +0000
- +++ b/a Thu Jan 01 00:00:00 1970 +0000
- @@ -1,5 +1,10 @@
- +-2
- +-1
- +0
- 1
- 2
- 3
- +foo
- +bar
- 4
- 5
- $ hg status
- M a
- A bar
- ? foo.orig
-
-More uncommit on the same dirty working copy
-=============================================
-
- $ hg uncommit -i<<EOF
- > y
- > y
- > n
- > EOF
- diff --git a/a b/a
- 2 hunks, 5 lines changed
- examine changes to 'a'? [Ynesfdaq?] y
-
- @@ -1,3 +1,6 @@
- +-2
- +-1
- +0
- 1
- 2
- 3
- discard change 1/2 to 'a'? [Ynesfdaq?] y
-
- @@ -1,5 +4,7 @@
- 1
- 2
- 3
- +foo
- +bar
- 4
- 5
- discard change 2/2 to 'a'? [Ynesfdaq?] n
-
-
- $ hg exp
- # HG changeset patch
- # User test
- # Date 0 0
- # Thu Jan 01 00:00:00 1970 +0000
- # Node ID 62d907d0c4fa13b4b8bfeed05f13751035daf963
- # Parent 7733902a8d94c789ca81d866bea1893d79442db6
- another one
-
- diff -r 7733902a8d94 -r 62d907d0c4fa a
- --- a/a Thu Jan 01 00:00:00 1970 +0000
- +++ b/a Thu Jan 01 00:00:00 1970 +0000
- @@ -1,5 +1,7 @@
- 1
- 2
- 3
- +foo
- +bar
- 4
- 5
-
- $ hg diff
- diff -r 62d907d0c4fa a
- --- a/a Thu Jan 01 00:00:00 1970 +0000
- +++ b/a Thu Jan 01 00:00:00 1970 +0000
- @@ -1,3 +1,6 @@
- +-2
- +-1
- +0
- 1
- 2
- 3
- @@ -5,3 +8,4 @@
- bar
- 4
- 5
- +babar
- diff -r 62d907d0c4fa bar
- --- /dev/null Thu Jan 01 00:00:00 1970 +0000
- +++ b/bar Thu Jan 01 00:00:00 1970 +0000
- @@ -0,0 +1,1 @@
- +foo
-
- $ hg status
- M a
- A bar
- ? foo.orig
-
-Interactive uncommit with a pattern
------------------------------------
-
-(more setup)
-
- $ hg ci -m 'roaming changes'
- $ cat > b << EOF
- > a
- > b
- > c
- > d
- > e
- > f
- > h
- > EOF
- $ hg add b
- $ hg ci -m 'add b'
- $ echo 'celeste' >> a
- $ echo 'i' >> b
- $ hg ci -m 'some more changes'
- $ hg export
- # HG changeset patch
- # User test
- # Date 0 0
- # Thu Jan 01 00:00:00 1970 +0000
- # Node ID be5c67225e80b050867862bbd9f4755c4e9207c5
- # Parent c280a907fddcef2ffe9fadcc2d87f29998e22b2f
- some more changes
-
- diff -r c280a907fddc -r be5c67225e80 a
- --- a/a Thu Jan 01 00:00:00 1970 +0000
- +++ b/a Thu Jan 01 00:00:00 1970 +0000
- @@ -9,3 +9,4 @@
- 4
- 5
- babar
- +celeste
- diff -r c280a907fddc -r be5c67225e80 b
- --- a/b Thu Jan 01 00:00:00 1970 +0000
- +++ b/b Thu Jan 01 00:00:00 1970 +0000
- @@ -5,3 +5,4 @@
- e
- f
- h
- +i
-
- $ hg uncommit -i a << DONE
- > y
- > y
- > DONE
- diff --git a/a b/a
- 1 hunks, 1 lines changed
- examine changes to 'a'? [Ynesfdaq?] y
-
- @@ -9,3 +9,4 @@
- 4
- 5
- babar
- +celeste
- discard this change to 'a'? [Ynesfdaq?] y
-
- $ hg status
- M a
- ? foo.orig
- $ hg diff
- diff -r c701d7c8d18b a
- --- a/a Thu Jan 01 00:00:00 1970 +0000
- +++ b/a Thu Jan 01 00:00:00 1970 +0000
- @@ -9,3 +9,4 @@
- 4
- 5
- babar
- +celeste
- $ hg export
- # HG changeset patch
- # User test
- # Date 0 0
- # Thu Jan 01 00:00:00 1970 +0000
- # Node ID c701d7c8d18be55a92688f4458c26bd74fb1f525
- # Parent c280a907fddcef2ffe9fadcc2d87f29998e22b2f
- some more changes
-
- diff -r c280a907fddc -r c701d7c8d18b b
- --- a/b Thu Jan 01 00:00:00 1970 +0000
- +++ b/b Thu Jan 01 00:00:00 1970 +0000
- @@ -5,3 +5,4 @@
- e
- f
- h
- +i
-
-(reset)
-
- $ cat << EOF > a
- > -3
- > -2
- > -1
- > 0
- > 1
- > 2
- > 3
- > foo
- > bar
- > 4
- > 5
- > babar
- > celeste
- > EOF
- $ hg amend
-
-Same but do not select some change in 'a'
-
- $ hg uncommit -i a << DONE
- > y
- > y
- > n
- > DONE
- diff --git a/a b/a
- 2 hunks, 2 lines changed
- examine changes to 'a'? [Ynesfdaq?] y
-
- @@ -1,3 +1,4 @@
- +-3
- -2
- -1
- 0
- discard change 1/2 to 'a'? [Ynesfdaq?] y
-
- @@ -9,3 +10,4 @@
- 4
- 5
- babar
- +celeste
- discard change 2/2 to 'a'? [Ynesfdaq?] n
-
- $ hg status
- M a
- ? foo.orig
-
- $ hg diff
- diff -r 28d5de12b225 a
- --- a/a Thu Jan 01 00:00:00 1970 +0000
- +++ b/a Thu Jan 01 00:00:00 1970 +0000
- @@ -1,3 +1,4 @@
- +-3
- -2
- -1
- 0
-
- $ hg export
- # HG changeset patch
- # User test
- # Date 0 0
- # Thu Jan 01 00:00:00 1970 +0000
- # Node ID 28d5de12b225d1e0951110cced8d8994227be026
- # Parent c280a907fddcef2ffe9fadcc2d87f29998e22b2f
- some more changes
-
- diff -r c280a907fddc -r 28d5de12b225 a
- --- a/a Thu Jan 01 00:00:00 1970 +0000
- +++ b/a Thu Jan 01 00:00:00 1970 +0000
- @@ -9,3 +9,4 @@
- 4
- 5
- babar
- +celeste
- diff -r c280a907fddc -r 28d5de12b225 b
- --- a/b Thu Jan 01 00:00:00 1970 +0000
- +++ b/b Thu Jan 01 00:00:00 1970 +0000
- @@ -5,3 +5,4 @@
- e
- f
- h
- +i
-
- $ cat b
- a
- b
- c
- d
- e
- f
- h
- i
--- a/tests/test-uncommit.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-uncommit.t Wed Mar 21 16:32:54 2018 +0100
@@ -233,7 +233,7 @@
touncommit-bm-inactive 4:e8db4aa611f6
unrelated 2:f63b90038565
$ hg debugobsolete
- 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'ef1': '*', 'user': 'test'} (glob)
Test phase is preserved, no local changes
@@ -279,8 +279,8 @@
o 0:07f494440405@default(draft) adda
$ hg debugobsolete
- 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (*) {'ef1': '*', 'user': 'test'} (glob)
Test --all
@@ -313,9 +313,9 @@
A e
$ hg debugobsolete
- 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (*) {'ef1': '*', 'user': 'test'} (glob)
Display a warning if nothing left
@@ -323,10 +323,10 @@
new changeset is empty
(use 'hg prune .' to remove it)
$ hg debugobsolete
- 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- c4cbebac3751269bdf12d1466deabcc78521d272 4f1c269eab68720f54e88ce3c1dc02b2858b6b89 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ c4cbebac3751269bdf12d1466deabcc78521d272 4f1c269eab68720f54e88ce3c1dc02b2858b6b89 0 (*) {'ef1': '*', 'user': 'test'} (glob)
Test instability warning
--- a/tests/test-userguide.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-userguide.t Wed Mar 21 16:32:54 2018 +0100
@@ -18,7 +18,7 @@
example 2: unsafe amend with plain vanilla Mercurial: the original
commit is stripped
$ hg commit --amend -u alice -d '1 0' -m 'implement feature Y'
- saved backup bundle to $TESTTMP/t/.hg/strip-backup/6e725fd2be6f-42cc74d4-amend.hg (glob)
+ saved backup bundle to $TESTTMP/t/.hg/strip-backup/6e725fd2be6f-42cc74d4-amend-backup.hg (glob)
$ hg log -r 23fe4ac6d3f1
abort: unknown revision '23fe4ac6d3f1'!
[255]
--- a/tests/test-wireproto-bundle1.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-wireproto-bundle1.t Wed Mar 21 16:32:54 2018 +0100
@@ -70,7 +70,6 @@
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files (+1 heads)
remote: 2 new obsolescence markers
- remote: obsoleted 1 changesets
$ hg push
pushing to ssh://user@dummy/server
searching for changes
@@ -88,7 +87,6 @@
adding file changes
added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
2 new obsolescence markers
- obsoleted 1 changesets
(run 'hg heads' to see heads)
$ hg -R ../other pull
pulling from ssh://user@dummy/server
--- a/tests/test-wireproto.t Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-wireproto.t Wed Mar 21 16:32:54 2018 +0100
@@ -74,7 +74,6 @@
remote: added 1 changesets with 1 changes to 1 files (+1 heads)
remote: obsmarker-exchange: 151 bytes received
remote: 2 new obsolescence markers
- remote: obsoleted 1 changesets
$ hg push
pushing to ssh://user@dummy/server
searching for changes
@@ -93,7 +92,6 @@
added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
obsmarker-exchange: 151 bytes received
2 new obsolescence markers
- obsoleted 1 changesets
(run 'hg heads' to see heads)
$ hg -R ../other pull
pulling from ssh://user@dummy/server
@@ -138,9 +136,8 @@
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 0 changes to 1 files (+1 heads)
- remote: obsmarker-exchange: 220 bytes received
+ remote: obsmarker-exchange: 227 bytes received
remote: 1 new obsolescence markers
- remote: obsoleted 1 changesets
$ hg -R ../other pull
pulling from ssh://user@dummy/server
searching for changes
@@ -148,9 +145,8 @@
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)
- obsmarker-exchange: 220 bytes received
+ obsmarker-exchange: 227 bytes received
1 new obsolescence markers
- obsoleted 1 changesets
(run 'hg heads' to see heads)
test discovery avoid exchanging known markers
@@ -173,7 +169,7 @@
(skipping discovery of obsolescence markers, will exchange everything)
(controled by 'experimental.evolution.obsdiscovery' configuration)
no changes found
- remote: obsmarker-exchange: 370 bytes received
+ remote: obsmarker-exchange: 377 bytes received
[1]
$ hg -R ../other pull --config experimental.evolution.obsdiscovery=no
pulling from ssh://user@dummy/server
@@ -181,7 +177,7 @@
no changes found
(skipping discovery of obsolescence markers, will exchange everything)
(controled by 'experimental.evolution.obsdiscovery' configuration)
- obsmarker-exchange: 370 bytes received
+ obsmarker-exchange: 377 bytes received
$ cd ..
@@ -211,7 +207,7 @@
pulling from http://localhost:$HGPORT/
searching for changes
no changes found
- obsmarker-exchange: 370 bytes received
+ obsmarker-exchange: 377 bytes received
$ hg -R client pull http://localhost:$HGPORT/ --config experimental.evolution=createmarkers
pulling from http://localhost:$HGPORT/