Mercurial > evolve
changeset 2798:2280461343e5 mercurial-4.2
test-compat: merge mercurial-4.2 with the new stable branch content
line wrap: on
line diff
--- a/tests/test-discovery-obshashrange.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-discovery-obshashrange.t Tue Jul 25 03:41:15 2017 +0200 @@ -34,9 +34,23 @@ * @0000000000000000000000000000000000000000 (*)> serve --stdio (glob) * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio exited 0 after *.?? seconds (glob) * @0000000000000000000000000000000000000000 (*)> debugbuilddag .+7 (glob) - * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (8r, 0o) (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 served branch cache in *.???? seconds (glob) + * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob) + * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (8r, 0o) (glob) * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (8r, 0o) (glob) * @0000000000000000000000000000000000000000 (*)> debugbuilddag .+7 exited 0 after *.?? seconds (glob) * @0000000000000000000000000000000000000000 (*)> blackbox (glob) @@ -152,10 +166,10 @@ $ rm ../server/.hg/blackbox.log $ hg blackbox * @0000000000000000000000000000000000000000 (*)> pull --rev 4 (glob) + * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob) + * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob) * @0000000000000000000000000000000000000000 (*)> updated stablerange cache in *.???? seconds (glob) * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (5r, 3o) (glob) - * @0000000000000000000000000000000000000000 (*)> updated base branch cache in *.???? seconds (glob) - * @0000000000000000000000000000000000000000 (*)> wrote base 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) @@ -192,7 +206,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 @@ -224,7 +238,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 @@ -234,12 +248,12 @@ received listkey for "phases": 58 bytes $ hg -R ../server blackbox * @0000000000000000000000000000000000000000 (*)> serve --stdio (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 stablerange cache in *.???? seconds (glob) * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (1r, 1o) (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-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) @@ -296,11 +310,10 @@ * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> add foo (glob) * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> add foo exited 0 after *.?? seconds (glob) * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> commit -m foo (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 (*)> updated evo-ext-obshashrange in *.???? seconds (1r, 0o) (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) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> commit -m foo exited 0 after *.?? seconds (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete ffffffffffffffffffffffffffffffffffffffff 45f8b879de922f6a6e620ba04205730335b6fc7e (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob) @@ -309,7 +322,6 @@ * @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 (*)> updated stablerange cache in *.???? seconds (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obsdiscovery, 0/5 mismatch - 1 obshashrange queries in *.???? seconds (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> push -f --debug exited 0 after *.?? seconds (glob) @@ -330,7 +342,7 @@ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete 22222222222222222bbbbbbbbbbbbb2222222222 2dc09a01254db841290af0538aa52f6f52c776e3 exited 0 after *.?? seconds (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> push (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 @@ -409,12 +421,13 @@ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> log -G exited 0 after *.?? seconds (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> pull -r 6 (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 stablerange cache in *.???? seconds (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obshashcache reset - new markers affect cached ranges (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obshashrange in *.???? seconds (2r, 3o) (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) @@ -554,18 +567,17 @@ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' exited 0 after *.?? seconds (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> pull (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 stablerange cache in *.???? seconds (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obshashrange in *.???? seconds (1r, 1o) (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 (*)> 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 @@ -605,9 +617,11 @@ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' exited 0 after *.?? seconds (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> pull (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obsdiscovery, 0/8 mismatch - 1 obshashrange queries in *.???? seconds (glob) + * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-obscache cache reset (glob) + * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (9r, 12o) (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated stablerange cache in *.???? seconds (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obshashrange in *.???? seconds (1r, 1o) (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 (*)> blackbox (glob) @@ -681,12 +695,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 @@ -716,9 +728,9 @@ * @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-obshashrange cache reset (glob) - * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obshashrange in *.???? seconds (5r, 11o) (glob) + * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obshashrange in *.???? seconds (5r, 13o) (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 stablerange cache in *.???? seconds (glob) * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obshashrange in *.???? seconds (3r, 0o) (glob) * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obscache in *.???? seconds (3r, 0o) (glob) @@ -730,13 +742,12 @@ * @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 (*)> obsdiscovery, 0/8 mismatch - 1 obshashrange queries in *.???? seconds (glob) + * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obscache in *.???? seconds (1r, 0o) (glob) * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated stablerange cache in *.???? seconds (glob) - * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> obshashcache reset - new markers affect cached ranges (glob) - * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obshashrange in *.???? seconds (1r, 2o) (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 (*)> updated evo-ext-obshashrange 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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-drop.t Tue Jul 25 03:41:15 2017 +0200 @@ -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: rewritten as a2c06c884bfe | summary: add child | o changeset: 1:19509a42b0d0 @@ -264,3 +263,4 @@ summary: add base ============ obsmark ============ + 87ea30a976fdf235bf096f04899cb02a903873e2 0 {34b6c051bf1f78db6aef400776de5cb964470207} (*) {'ef1': '0', 'user': 'test'} (glob)
--- a/tests/test-evolve-cycles.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-evolve-cycles.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 @@ -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
--- a/tests/test-evolve-obshistory-complex.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-evolve-obshistory-complex.t Tue Jul 25 03:41:15 2017 +0200 @@ -99,25 +99,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 @@ -273,25 +269,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 @@ -338,25 +330,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
--- a/tests/test-evolve-obshistory.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-evolve-obshistory.t Tue Jul 25 03:41:15 2017 +0200 @@ -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) by test (Thu Jan 01 00:00:00 1970 +0000) as 4ae3a4151de9 + rewritten(description, content) by test (*) as 4ae3a4151de9 (glob) --- a/471f378eab4c-changeset-description +++ b/4ae3a4151de9-changeset-description @@ -1,1 +1,3 @@ @@ -199,7 +197,6 @@ | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: pruned | summary: B0 | @ changeset: 1:471f378eab4c @@ -339,7 +336,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 @@ -593,7 +589,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 @@ -769,13 +764,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 @@ -976,7 +969,6 @@ | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten as fdf9bde5129a | summary: A0 | o changeset: 0:ea207398892e @@ -1009,8 +1001,6 @@ | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten as fdf9bde5129a - | obsolete: rewritten as 65b757b745b9 | summary: A0 | o changeset: 0:ea207398892e @@ -1292,7 +1282,6 @@ | x changeset: 2:0dec01379d3b |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten as b7ea6d14e664 | summary: B0 | o changeset: 1:471f378eab4c @@ -1320,19 +1309,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: rewritten 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 @@ -1556,13 +1542,11 @@ |/ parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten as 7a230b46bf61 | summary: A1 | | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten as fdf9bde5129a | summary: A0 | o changeset: 0:ea207398892e @@ -1603,7 +1587,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)
--- a/tests/test-evolve-serveronly-bundle2.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-evolve-serveronly-bundle2.t Tue Jul 25 03:41:15 2017 +0200 @@ -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-serveronly.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-evolve-serveronly.t Tue Jul 25 03:41:15 2017 +0200 @@ -116,7 +116,6 @@ (please upgrade your server) pushing 2 obsolescence markers (* bytes) (glob) remote: 2 obsolescence markers added - remote: obsoleted 1 changesets $ cat ../errors.log $ hg push pushing to http://localhost:$HGPORT/ @@ -140,7 +139,6 @@ pulling obsmarker using legacy method (please upgrade your server) 2 obsolescence markers added - obsoleted 1 changesets (run 'hg heads' to see heads) $ cat ../errors.log $ hg -R ../other pull
--- a/tests/test-evolve-templates.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-evolve-templates.t Tue Jul 25 03:41:15 2017 +0200 @@ -47,19 +47,16 @@ |/ parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten by test2 as d004c8f274b9 | summary: A1 | | x changeset: 2:f137d23bb3e1 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | obsolete: pruned by test1 | | summary: temporary amend commit for 471f378eab4c | | | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten by test1 as a468dc9b3633 | summary: A0 | o changeset: 0:ea207398892e @@ -79,10 +76,10 @@ o d004c8f274b9 (4) A2 | x a468dc9b3633 (3) A1 - | rewritten(description) by test2 (Thu Apr 19 04:25:21 2001 +0000) as d004c8f274b9 + | rewritten(description) by test2 (*) as d004c8f274b9 (glob) | @ 471f378eab4c (1) A0 - rewritten(description, content) by test1 (Fri Feb 13 23:31:30 2009 +0000) as a468dc9b3633 + rewritten(description, content) by test1 (*) as a468dc9b3633 (glob) $ hg tlog o d004c8f274b9 @@ -116,7 +113,7 @@ o d004c8f274b9 | | @ 471f378eab4c - |/ Obsfate: rewritten by test1, test2 as d004c8f274b9 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000) + |/ Obsfate: rewritten by test1, test2 as d004c8f274b9 (between * and *) (glob) | o ea207398892e @@ -183,7 +180,7 @@ o d004c8f274b9 | | @ a468dc9b3633 - |/ Obsfate: rewritten by test2 as d004c8f274b9 (at 2001-04-19 04:25 +0000) + |/ Obsfate: rewritten by test2 as d004c8f274b9 (at *) (glob) | o ea207398892e @@ -225,13 +222,13 @@ @ d004c8f274b9 | | x a468dc9b3633 - |/ Obsfate: rewritten by test2 as d004c8f274b9 (at 2001-04-19 04:25 +0000) + |/ Obsfate: rewritten by test2 as d004c8f274b9 (at *) (glob) | | x f137d23bb3e1 - | | Obsfate: pruned by test1 (at 2009-02-13 23:31 +0000) + | | Obsfate: pruned by test1 (at *) (glob) | | | x 471f378eab4c - |/ Obsfate: rewritten by test1 as a468dc9b3633 (at 2009-02-13 23:31 +0000) + |/ Obsfate: rewritten by test1 as a468dc9b3633 (at *) (glob) | o ea207398892e @@ -239,11 +236,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": "rewritten"}] + | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "rewritten"}] (glob) |/ - | x f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test1"]], [1234567890.0, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": [], "users": ["test1"], "verb": "pruned"}] + | x f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test1"]], [*, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [*, 0], "min_date": [*, 0], "successors": [], "users": ["test1"], "verb": "pruned"}] (glob) | | - | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test1"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test1"], "verb": "rewritten"}] + | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test1"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test1"], "verb": "rewritten"}] (glob) |/ o ea207398892e "" @@ -322,7 +319,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 @@ -409,7 +405,7 @@ | o 337fec4d2edc "" | - | x 471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["ef1", "12"], ["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 "" @@ -456,13 +452,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 @@ -576,9 +570,9 @@ $ hg fatelogjson --hidden @ eb5a0daa2192 "" | - | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["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, [["ef1", "9"], ["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 "" @@ -605,7 +599,6 @@ | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten as fdf9bde5129a | summary: A0 | o changeset: 0:ea207398892e @@ -638,8 +631,6 @@ | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten as fdf9bde5129a - | obsolete: rewritten as 65b757b745b9 | summary: A0 | o changeset: 0:ea207398892e @@ -743,11 +734,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": "rewritten"}] + | x 65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "rewritten"}] (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": "rewritten"}, {"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": "rewritten"}] + | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "rewritten"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "rewritten"}] (glob) |/ o ea207398892e "" @@ -775,7 +766,6 @@ | x changeset: 2:0dec01379d3b |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten as b7ea6d14e664 | summary: B0 | o changeset: 1:471f378eab4c @@ -803,19 +793,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: rewritten 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 @@ -960,11 +947,11 @@ $ hg fatelogjson --hidden @ eb5a0daa2192 "" | - | x b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["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": "rewritten"}] + | | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "rewritten"}] (glob) | |/ - | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["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 "" @@ -1010,13 +997,11 @@ |/ parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten as 7a230b46bf61 | summary: A1 | | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten as fdf9bde5129a | summary: A0 | o changeset: 0:ea207398892e @@ -1033,7 +1018,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) @@ -1048,7 +1032,6 @@ | @ changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten as 7a230b46bf61 | summary: A0 | o changeset: 0:ea207398892e @@ -1074,7 +1057,7 @@ o 7a230b46bf61 | | @ 471f378eab4c - |/ Obsfate: rewritten by test as 7a230b46bf61 (at 1970-01-01 00:00 +0000) + |/ Obsfate: rewritten by test as 7a230b46bf61 (between * and *) (glob) | o ea207398892e @@ -1105,7 +1088,7 @@ @ 7a230b46bf61 | | x 471f378eab4c - |/ Obsfate: rewritten by test as 7a230b46bf61 (at 1970-01-01 00:00 +0000) + |/ Obsfate: rewritten by test as 7a230b46bf61 (between * and *) (glob) | o ea207398892e @@ -1113,7 +1096,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": "rewritten"}] + | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, 0], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "rewritten"}] (glob) |/ o ea207398892e "" @@ -1148,7 +1131,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-exchange-obsmarkers-case-A3.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-A3.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 | @@ -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 | @@ -246,7 +242,6 @@ 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'} @@ -262,7 +257,6 @@ 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
--- a/tests/test-exchange-obsmarkers-case-A4.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-A4.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 |
--- a/tests/test-exchange-obsmarkers-case-A5.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-A5.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 |
--- a/tests/test-exchange-obsmarkers-case-A6.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-A6.t Tue Jul 25 03:41:15 2017 +0200 @@ -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-B5.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-B5.t Tue Jul 25 03:41:15 2017 +0200 @@ -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
--- a/tests/test-exchange-obsmarkers-case-B6.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-B6.t Tue Jul 25 03:41:15 2017 +0200 @@ -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
--- a/tests/test-exchange-obsmarkers-case-C2.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-C2.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 |
--- a/tests/test-exchange-obsmarkers-case-C3.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-C3.t Tue Jul 25 03:41:15 2017 +0200 @@ -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
--- a/tests/test-exchange-obsmarkers-case-C4.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-C4.t Tue Jul 25 03:41:15 2017 +0200 @@ -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
--- a/tests/test-exchange-obsmarkers-case-D1.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-D1.t Tue Jul 25 03:41:15 2017 +0200 @@ -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
--- a/tests/test-exchange-obsmarkers-case-D2.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-D2.t Tue Jul 25 03:41:15 2017 +0200 @@ -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
--- a/tests/test-exchange-obsmarkers-case-D3.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-D3.t Tue Jul 25 03:41:15 2017 +0200 @@ -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
--- a/tests/test-exchange-obsmarkers-case-D4.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-D4.t Tue Jul 25 03:41:15 2017 +0200 @@ -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
--- a/tests/test-inhibit.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-inhibit.t Tue Jul 25 03:41:15 2017 +0200 @@ -686,8 +686,6 @@ adding manifests adding file changes added 2 changesets with 1 changes to 2 files (+1 heads) - 3 new obsolescence markers - obsoleted 1 changesets (run 'hg heads .' to see heads, 'hg merge' to merge) Only allow direct access and check that evolve works like before
--- a/tests/test-obsolete.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-obsolete.t Tue Jul 25 03:41:15 2017 +0200 @@ -33,7 +33,6 @@ $ getid 3 0d3f46688ccc6e756c7e96cf64c391c411309597 $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 - obsoleted 1 changesets $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (*) {'user': 'test'} (glob) @@ -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 @@ -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: rewritten 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: rewritten 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: rewritten 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
--- a/tests/test-push-checkheads-partial-C1.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-partial-C1.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-partial-C2.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-partial-C3.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-partial-C4.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-pruned-B1.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-pruned-B2.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-pruned-B3.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-pruned-B4.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-pruned-B5.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-pruned-B6.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-pruned-B7.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-pruned-B8.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-superceed-A1.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-superceed-A2.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-superceed-A3.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-superceed-A4.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-superceed-A5.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-superceed-A6.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-superceed-A7.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-superceed-A8.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-unpushed-D1.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-unpushed-D2.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-unpushed-D3.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-unpushed-D4.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-unpushed-D5.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-unpushed-D6.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-unpushed-D7.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-sharing.t Tue Jul 25 03:41:15 2017 +0200 @@ -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-stabilize-conflict.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-stabilize-conflict.t Tue Jul 25 03:41:15 2017 +0200 @@ -152,7 +152,6 @@ |/ parent: 0:29ec1554cfaf | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten as e04690b09bc6 | summary: babar count up to ten | o changeset: 0:29ec1554cfaf @@ -244,7 +243,6 @@ |/ parent: 0:29ec1554cfaf | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten as b20d08eea373 | summary: babar count up to ten | o changeset: 0:29ec1554cfaf
--- a/tests/test-stabilize-order.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-stabilize-order.t Tue Jul 25 03:41:15 2017 +0200 @@ -220,7 +220,6 @@ | x changeset: 12:2256dae6521f |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten as f83a0bce03e4 | summary: addc | o changeset: 11:7a68bc4596ea
--- a/tests/test-topic.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-topic.t Tue Jul 25 03:41:15 2017 +0200 @@ -826,7 +826,7 @@ t0^ Add file delta (base) $ hg topics --age - * changewut (1970-01-01) + * changewut (*) (glob) $ cd .. @@ -869,10 +869,10 @@ changed topic on 1 changes $ hg add b $ hg topic topic1990 - $ hg ci -m "Added b" --config devel.default-date="631152000 0" + $ hg ci -m "Added b" --config devel.default-date="631152000 0" --date "631152000 0" $ hg add c $ hg topic topic2010 - $ hg ci -m "Added c" --config devel.default-date="1262304000 0" + $ hg ci -m "Added c" --config devel.default-date="1262304000 0" --date "1262304000 0" $ hg log changeset: 3:9048b194797d tag: tip @@ -899,15 +899,15 @@ topic1990 * topic2010 $ hg topics --age + topic1970 (*) (glob) * topic2010 (2010-01-01) topic1990 (1990-01-01) - topic1970 (1970-01-01) $ hg up topic1970 switching to topic topic1970 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ hg topics --age + * topic1970 (*) (glob) topic2010 (2010-01-01) topic1990 (1990-01-01) - * topic1970 (1970-01-01) $ cd ..
--- a/tests/test-tutorial.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-tutorial.t Tue Jul 25 03:41:15 2017 +0200 @@ -741,7 +741,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-userguide.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-userguide.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-wireproto-bundle1.t Tue Jul 25 03:41:15 2017 +0200 @@ -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 Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-wireproto.t Tue Jul 25 03:41:15 2017 +0200 @@ -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: 226 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: 226 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: 376 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,6 +177,6 @@ no changes found (skipping discovery of obsolescence markers, will exchange everything) (controled by 'experimental.evolution.obsdiscovery' configuration) - obsmarker-exchange: 376 bytes received + obsmarker-exchange: 377 bytes received $ cd ..