Mercurial > evolve
changeset 3716:e5ba6531503e mercurial-4.3
testcompat: update output for Mercurial 4.3
Lets of minor update + one major update to tests/test-evolve-phase-divergence.t
since all hashed chance (different instability name).
line wrap: on
line diff
--- a/tests/test-amend-patch.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-amend-patch.t Wed Apr 25 01:58:45 2018 +0100 @@ -88,7 +88,7 @@ @ af624b221c0c (1) added a | x f7ad41964313 (0) added a - rewritten(content) as af624b221c0c using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(content) as af624b221c0c by test (Thu Jan 01 00:00:00 1970 +0000) diff --git a/a b/a --- a/a +++ b/a
--- a/tests/test-evolve-abort.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-evolve-abort.t Wed Apr 25 01:58:45 2018 +0100 @@ -72,11 +72,11 @@ $ echo babar > d $ hg add d $ hg amend - 1 new orphan changesets + 1 new unstable changesets $ hg evolve --all move:[4] added d - atop:[5] added c + atop:[6] added c merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') evolve failed! @@ -89,7 +89,7 @@ working directory is now at e93a9161a274 $ hg glog - @ 5:e93a9161a274 added c + @ 6:e93a9161a274 added c | () draft | o 4:c41c793e0ef1 added d | | () draft @@ -110,7 +110,7 @@ $ hg evolve --all move:[4] added d - atop:[5] added c + atop:[6] added c merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') evolve failed! @@ -134,13 +134,13 @@ $ echo bar > c $ hg add c $ hg amend - 3 new orphan changesets + 3 new unstable changesets $ hg evolve --all move:[2] added b - atop:[7] added a - move:[5] added c - atop:[8] added b + atop:[9] added a + move:[6] added c + atop:[10] added b merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') evolve failed! @@ -149,13 +149,13 @@ [255] $ hg glog - @ 8:0c41ec482070 added b + @ 10:0c41ec482070 added b | () draft - o 7:125af0ed8cae added a + o 9:125af0ed8cae added a | () draft - | o 6:e83de241f751 added d + | o 7:e83de241f751 added d | | () draft - | o 5:e93a9161a274 added c + | o 6:e93a9161a274 added c | | () draft | x 2:b1661037fa25 added b | | () draft @@ -169,11 +169,11 @@ working directory is now at 125af0ed8cae $ hg glog - @ 7:125af0ed8cae added a + @ 9:125af0ed8cae added a | () draft - | o 6:e83de241f751 added d + | o 7:e83de241f751 added d | | () draft - | o 5:e93a9161a274 added c + | o 6:e93a9161a274 added c | | () draft | o 2:b1661037fa25 added b | | () draft @@ -226,15 +226,15 @@ [1] added a $ echo aa > a $ hg amend - 5 new orphan changesets + 5 new unstable changesets $ hg evolve --all move:[2] added b - atop:[7] added a + atop:[8] added a move:[4] added c - atop:[7] added a + atop:[8] added a move:[6] foo to a - atop:[7] added a + atop:[8] added a merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') evolve failed! @@ -243,11 +243,11 @@ [255] $ hg glog - o 9:7f8e8bd9f0b6 added c + o 10:7f8e8bd9f0b6 added c | () draft - | o 8:db3b42ef4da7 added b + | o 9:db3b42ef4da7 added b |/ () draft - @ 7:807e8e2ca559 added a + @ 8:807e8e2ca559 added a | () draft | o 6:8f20d4390c21 foo to a | | () draft @@ -269,7 +269,7 @@ working directory is now at 807e8e2ca559 $ hg glog - @ 7:807e8e2ca559 added a + @ 8:807e8e2ca559 added a | () draft | o 6:8f20d4390c21 foo to a | | () draft @@ -295,11 +295,11 @@ $ hg evolve --all move:[2] added b - atop:[7] added a + atop:[8] added a move:[4] added c - atop:[7] added a + atop:[8] added a move:[6] foo to a - atop:[7] added a + atop:[8] added a merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') evolve failed! @@ -307,11 +307,11 @@ abort: unresolved merge conflicts (see hg help resolve) [255] $ hg glog - o 9:7f8e8bd9f0b6 added c + o 10:7f8e8bd9f0b6 added c | () draft - | o 8:db3b42ef4da7 added b + | o 9:db3b42ef4da7 added b |/ () draft - @ 7:807e8e2ca559 added a + @ 8:807e8e2ca559 added a | () draft | o 6:8f20d4390c21 foo to a | | () draft @@ -343,7 +343,7 @@ adding manifests adding file changes added 10 changesets with 8 changes to 5 files (+4 heads) - 3 new obsolescence markers + 4 new obsolescence markers $ cd ../clonerepo $ hg up 7f8e8bd9f0b6 3 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -373,11 +373,11 @@ $ hg evolve --all move:[3] added c - atop:[8] added b + atop:[9] added b move:[5] added d - atop:[9] added c + atop:[10] added c move:[6] foo to a - atop:[7] added a + atop:[8] added a merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') evolve failed! @@ -386,17 +386,17 @@ [255] $ hg glog - o 12:1c476940790a added d + o 13:1c476940790a added d | () draft - | o 11:c10a55eb0cc6 added c + | o 12:c10a55eb0cc6 added c | | () draft - +---o 10:48eca1ed5478 made an new commit on evolved rev + +---o 11:48eca1ed5478 made an new commit on evolved rev | | () draft - o | 9:7f8e8bd9f0b6 added c + o | 10:7f8e8bd9f0b6 added c | | () draft - | o 8:db3b42ef4da7 added b + | o 9:db3b42ef4da7 added b |/ () draft - @ 7:807e8e2ca559 added a + @ 8:807e8e2ca559 added a | () draft | o 6:8f20d4390c21 foo to a | | () draft @@ -437,10 +437,10 @@ $ echo foo > c $ hg add c $ hg amend - 2 new orphan changesets + 2 new unstable changesets $ hg glog - @ 4:a0086c17bfc7 added a + @ 5:a0086c17bfc7 added a | () draft | o 3:17509928e5bf added c | | () draft @@ -453,9 +453,9 @@ $ hg evolve --all move:[2] added b - atop:[4] added a + atop:[5] added a move:[3] added c - atop:[5] added b + atop:[6] added b merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') evolve failed! @@ -464,9 +464,9 @@ [255] $ hg glog - @ 5:c1f4718020e3 added b + @ 6:c1f4718020e3 added b | (bm1) draft - o 4:a0086c17bfc7 added a + o 5:a0086c17bfc7 added a | () draft | o 3:17509928e5bf added c | | () draft @@ -482,7 +482,7 @@ working directory is now at a0086c17bfc7 $ hg glog - @ 4:a0086c17bfc7 added a + @ 5:a0086c17bfc7 added a | () draft | o 3:17509928e5bf added c | | () draft
--- a/tests/test-evolve-cycles.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-evolve-cycles.t Wed Apr 25 01:58:45 2018 +0100 @@ -89,48 +89,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 (Thu Jan 01 00:00:00 1970 +0000) | 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 (Thu Jan 01 00:00:00 1970 +0000) | 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 (Thu Jan 01 00:00:00 1970 +0000) | $ 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 (Thu Jan 01 00:00:00 1970 +0000) | 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 (Thu Jan 01 00:00:00 1970 +0000) | 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 (Thu Jan 01 00:00:00 1970 +0000) | $ 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 (Thu Jan 01 00:00:00 1970 +0000) | 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 (Thu Jan 01 00:00:00 1970 +0000) | 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 (Thu Jan 01 00:00:00 1970 +0000) | 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 (Thu Jan 01 00:00:00 1970 +0000) | 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 (Thu Jan 01 00:00:00 1970 +0000) | 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 (Thu Jan 01 00:00:00 1970 +0000) | Test with multiple cyles @@ -252,42 +252,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 (Thu Jan 01 00:00:00 1970 +0000) | @ 868d2e0eb19c (4) D - |\ rewritten as 0da815c333f6 by test (Thu Jan 01 00:00:00 1970 +0000) + |\ rewritten(description, parent, content) as 0da815c333f6 by test (Thu Jan 01 00:00:00 1970 +0000) | | | 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 (Thu Jan 01 00:00:00 1970 +0000) | | +---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 (Thu Jan 01 00:00:00 1970 +0000) | | 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 (Thu Jan 01 00:00:00 1970 +0000) | | 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 (Thu Jan 01 00:00:00 1970 +0000) | | 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 (Thu Jan 01 00:00:00 1970 +0000) | @ 868d2e0eb19c (4) D - |\ rewritten as 0da815c333f6 by test (Thu Jan 01 00:00:00 1970 +0000) + |\ rewritten(description, parent, content) as 0da815c333f6 by test (Thu Jan 01 00:00:00 1970 +0000) | | | 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 (Thu Jan 01 00:00:00 1970 +0000) | | +---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 (Thu Jan 01 00:00:00 1970 +0000) | | 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 (Thu Jan 01 00:00:00 1970 +0000) | | 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 (Thu Jan 01 00:00:00 1970 +0000) | | Check the json output is valid in this case @@ -300,6 +300,11 @@ *, (glob) 0 ], + "effect": [ + *, (glob) + *, (glob) + "content" + ], "succnodes": [ "0da815c333f6" ], @@ -318,6 +323,11 @@ *, (glob) 0 ], + "effect": [ + *, (glob) + *, (glob) + "content" + ], "succnodes": [ "868d2e0eb19c" ], @@ -333,9 +343,14 @@ "markers": [ { "date": [ - *, (glob) + 0.0, 0 ], + "effect": [ + "description", + "parent", + "content" + ], "succnodes": [ "d9f908fde1a1" ], @@ -351,9 +366,14 @@ "markers": [ { "date": [ - *, (glob) + 0.0, 0 ], + "effect": [ + "description", + "parent", + "content" + ], "succnodes": [ "2a34000d3544", "868d2e0eb19c" @@ -370,9 +390,14 @@ "markers": [ { "date": [ - *, (glob) + 0.0, 0 ], + "effect": [ + "description", + "parent", + "content" + ], "succnodes": [ "a8df460dbbfe" ], @@ -388,9 +413,14 @@ "markers": [ { "date": [ - *, (glob) + 0.0, 0 ], + "effect": [ + "description", + "parent", + "content" + ], "succnodes": [ "c473644ee0e9" ],
--- a/tests/test-evolve-issue5832.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-evolve-issue5832.t Wed Apr 25 01:58:45 2018 +0100 @@ -52,7 +52,7 @@ 0 files updated, 0 files merged, 3 files removed, 0 files unresolved $ echo foo > a $ hg amend - 2 new orphan changesets + 2 new unstable changesets $ hg up bde1d2b6b5e5 0 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -63,11 +63,11 @@ $ echo d > d $ hg ci -Aqm "added d" $ hg glog - @ 7:5841d7cf9893 added d + @ 8:5841d7cf9893 added d | () draft - | o 6:62fb70414f99 added c + | o 7:62fb70414f99 added c |/ () draft - | o 5:7014ec2829cd added a + | o 6:7014ec2829cd added a |/ () draft | o 4:b9b387427a53 merge commit | |\ () draft @@ -84,11 +84,11 @@ 1 changesets pruned $ hg glog - @ 7:5841d7cf9893 added d + @ 8:5841d7cf9893 added d | () draft - | o 6:62fb70414f99 added c + | o 7:62fb70414f99 added c |/ () draft - | o 5:7014ec2829cd added a + | o 6:7014ec2829cd added a |/ () draft | o 4:b9b387427a53 merge commit | |\ () draft @@ -105,7 +105,7 @@ $ hg evolve --dry-run --any --all move:[2] added b - atop:[5] added a + atop:[6] added a hg rebase -r a1da0651488c -d 7014ec2829cd could not solve instability, ambiguous destination: parent split across two branches @@ -115,29 +115,29 @@ > 0 > EOF move:[2] added b - atop:[5] added a + atop:[6] added a move:[4] merge commit - atop:[8] added b + atop:[9] added b ancestor '7235ef625ea3' split over multiple topological branches. choose an evolve destination: 0: [62fb70414f99] added c 1: [5841d7cf9893] added d q: quit the prompt enter the index of the revision you want to select: 0 - move:[9] merge commit - atop:[6] added c + move:[10] merge commit + atop:[7] added c working directory is now at 28a0775ac832 $ hg glog - @ 10:28a0775ac832 merge commit + @ 11:28a0775ac832 merge commit |\ () draft - | o 8:2baf8bae7ea4 added b + | o 9:2baf8bae7ea4 added b | | () draft - | | o 7:5841d7cf9893 added d + | | o 8:5841d7cf9893 added d | | | () draft - o---+ 6:62fb70414f99 added c + o---+ 7:62fb70414f99 added c / / () draft - o / 5:7014ec2829cd added a + o / 6:7014ec2829cd added a |/ () draft o 0:bde1d2b6b5e5 added base () draft
--- a/tests/test-evolve-obshistory-complex.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-evolve-obshistory-complex.t Wed Apr 25 01:58:45 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 (Thu Jan 01 00:00:00 1970 +0000) | 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 (Thu Jan 01 00:00:00 1970 +0000) note: folding changesets to test $ hg log -G @@ -387,25 +387,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 (Thu Jan 01 00:00:00 1970 +0000) | | | | | 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 (Thu Jan 01 00:00:00 1970 +0000) | | | 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 (Thu Jan 01 00:00:00 1970 +0000) | | x | a8df460dbbfe (3) C - / rewritten as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000) + / rewritten(description, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000) | 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 (Thu Jan 01 00:00:00 1970 +0000) | | x | 2a34000d3544 (1) A - / rewritten as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000) + / rewritten(description, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000) | 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 (Thu Jan 01 00:00:00 1970 +0000) While with all option, we should see 15 changesets @@ -419,38 +419,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 (Thu Jan 01 00:00:00 1970 +0000) | | | | | | | +-------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 (Thu Jan 01 00:00:00 1970 +0000) | | | | | 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 (Thu Jan 01 00:00:00 1970 +0000) | | | | | | x | 0da815c333f6 (5) E - | | / rewritten as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000) + | | / rewritten(description, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000) | | | 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 (Thu Jan 01 00:00:00 1970 +0000) | | | | | | 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 (Thu Jan 01 00:00:00 1970 +0000) | | | | | | | | | 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 (Thu Jan 01 00:00:00 1970 +0000) | | | | 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 (Thu Jan 01 00:00:00 1970 +0000) | | | | 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 (Thu Jan 01 00:00:00 1970 +0000) | | | x a8df460dbbfe (3) C - | rewritten as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000) + | rewritten(description, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000) | 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 (Thu Jan 01 00:00:00 1970 +0000)
--- a/tests/test-evolve-obshistory.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-evolve-obshistory.t Wed Apr 25 01:58:45 2018 +0100 @@ -405,7 +405,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 (Thu Jan 01 00:00:00 1970 +0000) note: testing split (No patch available, too many successors (2)) @@ -418,6 +418,10 @@ *, (glob) 0 (glob) ], + "effect": [ + "parent", + "content" + ], "note": "testing split", "succnodes": [ "337fec4d2edc", @@ -438,7 +442,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 (Thu Jan 01 00:00:00 1970 +0000) note: testing split (No patch available, too many successors (2)) @@ -449,7 +453,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 (Thu Jan 01 00:00:00 1970 +0000) note: testing split (No patch available, too many successors (2)) @@ -459,7 +463,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 (Thu Jan 01 00:00:00 1970 +0000) note: testing split (No patch available, too many successors (2)) @@ -470,7 +474,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 (Thu Jan 01 00:00:00 1970 +0000) note: testing split (No patch available, too many successors (2)) @@ -481,7 +485,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 (Thu Jan 01 00:00:00 1970 +0000) note: testing split (No patch available, too many successors (2)) @@ -493,7 +497,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 (Thu Jan 01 00:00:00 1970 +0000) note: testing split (No patch available, too many successors (2)) @@ -662,7 +666,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 (Thu Jan 01 00:00:00 1970 +0000) (No patch available, too many successors (4)) $ hg obslog de7290d8b885 --hidden --all --patch @@ -675,7 +679,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 (Thu Jan 01 00:00:00 1970 +0000) (No patch available, too many successors (4)) $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool @@ -687,6 +691,10 @@ *, (glob) 0 (glob) ], + "effect": [ + "parent", + "content" + ], "succnodes": [ "1ae8bc733a14", "337fec4d2edc", @@ -706,7 +714,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 (Thu Jan 01 00:00:00 1970 +0000) (No patch available, too many successors (4)) $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool @@ -724,6 +732,10 @@ *, (glob) 0 (glob) ], + "effect": [ + "parent", + "content" + ], "succnodes": [ "1ae8bc733a14", "337fec4d2edc", @@ -750,7 +762,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 (Thu Jan 01 00:00:00 1970 +0000) (No patch available, too many successors (4)) $ hg obslog 5 --all --patch @@ -763,7 +775,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 (Thu Jan 01 00:00:00 1970 +0000) (No patch available, too many successors (4)) $ hg update de7290d8b885 @@ -838,7 +850,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 (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r eb5a0daa2192 changeset-description --- a/changeset-description +++ b/changeset-description @@ -858,11 +870,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 (Thu Jan 01 00:00:00 1970 +0000) | (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 (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r eb5a0daa2192 changeset-description --- a/changeset-description +++ b/changeset-description @@ -881,7 +893,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 (Thu Jan 01 00:00:00 1970 +0000) (No patch available, changesets rebased) Check that with all option, all changesets are shown @@ -889,11 +901,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 (Thu Jan 01 00:00:00 1970 +0000) | (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 (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r eb5a0daa2192 changeset-description --- a/changeset-description +++ b/changeset-description @@ -914,11 +926,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 (Thu Jan 01 00:00:00 1970 +0000) | (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 (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r eb5a0daa2192 changeset-description --- a/changeset-description +++ b/changeset-description @@ -948,6 +960,10 @@ *, (glob) 0 (glob) ], + "effect": [ + *, (glob) + "content" + ], "succnodes": [ "eb5a0daa2192" ], @@ -963,9 +979,14 @@ "markers": [ { "date": [ - *, (glob) + 0.0, 0 (glob) ], + "effect": [ + "description", + "parent", + "content" + ], "succnodes": [ "eb5a0daa2192" ], @@ -1403,7 +1424,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 (Thu Jan 01 00:00:00 1970 +0000) | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description | --- a/changeset-description | +++ b/changeset-description @@ -1419,7 +1440,7 @@ | | 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 (Thu Jan 01 00:00:00 1970 +0000) | (No patch available, changesets rebased) | x 0dec01379d3b (2) B0 @@ -1437,7 +1458,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 (Thu Jan 01 00:00:00 1970 +0000) | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description | --- a/changeset-description | +++ b/changeset-description @@ -1453,7 +1474,7 @@ | | 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 (Thu Jan 01 00:00:00 1970 +0000) | (No patch available, changesets rebased) | x 0dec01379d3b (2) B0 @@ -1481,6 +1502,11 @@ *, (glob) 0 (glob) ], + "effect": [ + *, (glob) + *, (glob) + "content" + ], "succnodes": [ "eb5a0daa2192" ], @@ -1496,7 +1522,7 @@ "markers": [ { "date": [ - *, (glob) + 0.0, 0 (glob) ], "effect": [ @@ -1517,9 +1543,13 @@ "markers": [ { "date": [ - *, (glob) + 0.0, 0 (glob) ], + "effect": [ + "description", + "content" + ], "succnodes": [ "eb5a0daa2192" ],
--- a/tests/test-evolve-phase-divergence.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-evolve-phase-divergence.t Wed Apr 25 01:58:45 2018 +0100 @@ -113,7 +113,7 @@ pulling from ../public searching for changes no changes found - 1 new phase-divergent changesets + 1 new bumped changesets $ hg glog @ 2:98bb3a6cfe1a tweak a @@ -128,7 +128,7 @@ $ hg evolve --list 98bb3a6cfe1a: tweak a - phase-divergent: 4d1169d82e47 (immutable precursor) + bumped: 4d1169d82e47 (immutable precursor) @@ -151,7 +151,7 @@ @ 98bb3a6cfe1a (2) tweak a | o 4d1169d82e47 (1) modify a - rewritten(description) as 98bb3a6cfe1a using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as 98bb3a6cfe1a by test (Thu Jan 01 00:00:00 1970 +0000) Solving the phase divergence using evolve command -------------------------------------------------- @@ -183,7 +183,7 @@ hg rebase --rev 98bb3a6cfe1a --dest d3873e73d99e; hg update 4d1169d82e47; hg revert --all --rev 98bb3a6cfe1a; - hg commit --msg "phase-divergent update to 98bb3a6cfe1a" + hg commit --msg "bumped update to 98bb3a6cfe1a" XXX: evolve should have mentioned that draft commit is just obsoleted in favour of public one. From the message it looks like a new commit is created. @@ -258,7 +258,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets aa071e5554e3 (run 'hg update' to get a working copy) $ hg push ../public @@ -281,10 +280,10 @@ pulling from ../public searching for changes no changes found - 1 new phase-divergent changesets + 1 new bumped changesets $ hg glog - @ 4:d47f2b37ed82 added bar to foo + @ 5:d47f2b37ed82 added bar to foo | (bm) draft | o 3:aa071e5554e3 added foo to foo |/ () public @@ -303,24 +302,24 @@ test I have to go through code base to understand what will be the behavior $ hg evolve --phase-divergent - recreate:[4] added bar to foo + recreate:[5] added bar to foo atop:[3] added foo to foo computing new diff - committed as 3d62500c673d - working directory is now at 3d62500c673d + committed as bdf645eb43bb + working directory is now at bdf645eb43bb $ hg exp # HG changeset patch # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 - # Node ID 3d62500c673dd1c88bb09a73e86d0210aed6fcb6 + # Node ID bdf645eb43bb0c9f180cd17d109bb359ce1571b2 # Parent aa071e5554e36080a36cfd24accd5a71e3320f1e - phase-divergent update to aa071e5554e3: + bumped update to aa071e5554e3: added bar to foo - diff -r aa071e5554e3 -r 3d62500c673d foo + diff -r aa071e5554e3 -r bdf645eb43bb 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 @@ @@ -331,7 +330,7 @@ the commit message $ hg glog - @ 5:3d62500c673d phase-divergent update to aa071e5554e3: + @ 6:bdf645eb43bb bumped update to aa071e5554e3: | (bm) draft o 3:aa071e5554e3 added foo to foo | () public @@ -341,13 +340,13 @@ () public $ hg obslog -r . --all - @ 3d62500c673d (5) phase-divergent update to aa071e5554e3: + @ bdf645eb43bb (6) bumped update to aa071e5554e3: | - x d47f2b37ed82 (4) added bar to foo - | rewritten(description, parent, content) as 3d62500c673d using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + x d47f2b37ed82 (5) added bar to foo + | rewritten(description, parent, content) as bdf645eb43bb by test (Thu Jan 01 00:00:00 1970 +0000) | o aa071e5554e3 (3) added foo to foo - rewritten(description, content) as d47f2b37ed82 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description, content) as d47f2b37ed82 by test (Thu Jan 01 00:00:00 1970 +0000) Syncing all other repositories @@ -363,7 +362,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - 2 new obsolescence markers + 3 new obsolescence markers $ hg push ../private pushing to ../private @@ -372,7 +371,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - 2 new obsolescence markers + 3 new obsolescence markers $ hg push ../public pushing to ../public @@ -381,7 +380,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - 2 new obsolescence markers + 3 new obsolescence markers Creating a phasedivergence changeset where the divergent changeset changed in a way that we rebase that on old public changeset, there will be conflicts, but @@ -411,7 +410,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets b756eb10ea73 (run 'hg update' to get a working copy) $ hg push ../public @@ -432,14 +430,14 @@ pulling from ../public searching for changes no changes found - 1 new phase-divergent changesets + 1 new bumped changesets $ hg glog - @ 7:2c3560aedead foo to bar + @ 9:d529f41744b3 foo to bar | (bm) draft - | o 6:b756eb10ea73 added bar to bar + | o 7:6176b60d16d2 added bar to bar |/ () public - o 5:3d62500c673d phase-divergent update to aa071e5554e3: + o 6:bdf645eb43bb bumped update to aa071e5554e3: | () public o 3:aa071e5554e3 added foo to foo | () public @@ -452,24 +450,24 @@ --------------------------------------------------------------- $ hg evolve --phase-divergent - recreate:[7] foo to bar - atop:[6] added bar to bar + recreate:[9] foo to bar + atop:[7] added bar to bar computing new diff - committed as 502e73736632 - working directory is now at 502e73736632 + committed as 73f67b6cf2c4 + working directory is now at 73f67b6cf2c4 $ hg exp # HG changeset patch # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 - # Node ID 502e737366322886cf628276aa0a2796904453b4 - # Parent b756eb10ea73ee4ba69c998e64a5c6e1005d74b5 - phase-divergent update to b756eb10ea73: + # Node ID 73f67b6cf2c428075c41d377f8651912e0d8cae2 + # Parent 6176b60d16d20d69c77bb27c2a1b79caec671612 + bumped update to 6176b60d16d2: foo to bar - diff -r b756eb10ea73 -r 502e73736632 bar + diff -r 6176b60d16d2 -r 73f67b6cf2c4 bar --- a/bar Thu Jan 01 00:00:00 1970 +0000 +++ b/bar Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +1,1 @@ @@ -477,11 +475,11 @@ +foo $ hg glog - @ 8:502e73736632 phase-divergent update to b756eb10ea73: + @ 10:73f67b6cf2c4 bumped update to 6176b60d16d2: | (bm) draft - o 6:b756eb10ea73 added bar to bar + o 7:6176b60d16d2 added bar to bar | () public - o 5:3d62500c673d phase-divergent update to aa071e5554e3: + o 6:bdf645eb43bb bumped update to aa071e5554e3: | () public o 3:aa071e5554e3 added foo to foo | () public @@ -500,7 +498,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - 2 new obsolescence markers + 3 new obsolescence markers $ hg push ../public pushing to ../public searching for changes @@ -508,7 +506,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - 2 new obsolescence markers + 3 new obsolescence markers Creating phase-divergence with divergent changeset and precursor having different parents @@ -539,8 +537,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files - 2 new obsolescence markers - new changesets 502e73736632:2352021b3785 + 3 new obsolescence markers (run 'hg update' to get a working copy) $ hg push ../public pushing to ../public @@ -555,7 +552,7 @@ $ cd ../alice $ hg rebase -r . -d .^^^ - rebasing 9:2352021b3785 "added x to x" (bm tip) + rebasing 11:ae81846887bc "added x to x" (tip bm) $ hg pull ../public pulling from ../public @@ -564,10 +561,10 @@ 1 new bumped changesets $ hg obslog -r . - @ 334e300d6db5 (10) added x to x + @ 5cc37876a882 (12) added x to x | - o 2352021b3785 (9) added x to x - rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) + o ae81846887bc (11) added x to x + rewritten(parent) as 5cc37876a882 by test (Thu Jan 01 00:00:00 1970 +0000) $ hg glog -r .^:: hg: parse error at 4: not a prefix: end @@ -577,23 +574,23 @@ --------------------------------------------- $ hg evolve --phase-divergent - recreate:[10] added x to x - atop:[9] added x to x - rebasing to destination parent: 502e73736632 + recreate:[12] added x to x + atop:[11] added x to x + rebasing to destination parent: 73f67b6cf2c4 (leaving bookmark bm) computing new diff - committed as 2352021b3785 - working directory is now at 2352021b3785 + committed as ae81846887bc + working directory is now at ae81846887bc XXX: we should move bookmark here $ hg glog - @ 9:2352021b3785 added x to x + @ 11:ae81846887bc added x to x | (bm) public - o 8:502e73736632 phase-divergent update to b756eb10ea73: + o 10:73f67b6cf2c4 bumped update to 6176b60d16d2: | () public - o 6:b756eb10ea73 added bar to bar + o 7:6176b60d16d2 added bar to bar | () public - o 5:3d62500c673d phase-divergent update to aa071e5554e3: + o 6:bdf645eb43bb bumped update to aa071e5554e3: | () public o 3:aa071e5554e3 added foo to foo | () public @@ -602,15 +599,15 @@ o 0:d3873e73d99e init () public - $ hg obslog -r . b1a0e143e32b --all --hidden - x b1a0e143e32b (11) added x to x - | pruned using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + $ hg obslog -r ae81846887bc --all --hidden + x 14c7c60e138f (13) added x to x + | pruned by test (Thu Jan 01 00:00:00 1970 +0000) | - x 334e300d6db5 (10) added x to x - | rewritten(parent) as b1a0e143e32b using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + x 5cc37876a882 (12) added x to x + | rewritten(parent) as 14c7c60e138f by test (Thu Jan 01 00:00:00 1970 +0000) | - @ 2352021b3785 (9) added x to x - rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) + @ ae81846887bc (11) added x to x + rewritten(parent) as 5cc37876a882 by test (Thu Jan 01 00:00:00 1970 +0000) $ hg exp @@ -618,11 +615,11 @@ # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 - # Node ID 2352021b37851be226ebed109b0eb6eada918566 - # Parent 502e737366322886cf628276aa0a2796904453b4 + # Node ID ae81846887bc53e9ba17ea2172950677d1ba3a1d + # Parent 73f67b6cf2c428075c41d377f8651912e0d8cae2 added x to x - diff -r 502e73736632 -r 2352021b3785 x + diff -r 73f67b6cf2c4 -r ae81846887bc 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 @@ @@ -635,13 +632,13 @@ Alice is tired of pushing and pulling and will create phase-divergence locally $ hg glog - @ 9:2352021b3785 added x to x + @ 11:ae81846887bc added x to x | (bm) public - o 8:502e73736632 phase-divergent update to b756eb10ea73: + o 10:73f67b6cf2c4 bumped update to 6176b60d16d2: | () public - o 6:b756eb10ea73 added bar to bar + o 7:6176b60d16d2 added bar to bar | () public - o 5:3d62500c673d phase-divergent update to aa071e5554e3: + o 6:bdf645eb43bb bumped update to aa071e5554e3: | () public o 3:aa071e5554e3 added foo to foo | () public @@ -655,27 +652,27 @@ $ hg add y $ hg ci -m "y to y and foobar to foo" $ hg rebase -r . -d .^^^ - rebasing 12:dc88f5aa9bc9 "y to y and foobar to foo" (tip) + rebasing 14:43dd61d1a393 "y to y and foobar to foo" (tip) $ echo foo > y $ hg amend Alice making the old changeset public to have content-divergence - $ hg phase -r dc88f5aa9bc9 --public --hidden - 1 new phase-divergent changesets + $ hg phase -r 43dd61d1a393 --public --hidden + 1 new bumped changesets $ hg glog - @ 14:13015a180eee y to y and foobar to foo + @ 17:694790041d7d y to y and foobar to foo | () draft - | o 12:dc88f5aa9bc9 y to y and foobar to foo + | o 14:43dd61d1a393 y to y and foobar to foo | | () public - | o 9:2352021b3785 added x to x + | o 11:ae81846887bc added x to x | | (bm) public - | o 8:502e73736632 phase-divergent update to b756eb10ea73: + | o 10:73f67b6cf2c4 bumped update to 6176b60d16d2: |/ () public - o 6:b756eb10ea73 added bar to bar + o 7:6176b60d16d2 added bar to bar | () public - o 5:3d62500c673d phase-divergent update to aa071e5554e3: + o 6:bdf645eb43bb bumped update to aa071e5554e3: | () public o 3:aa071e5554e3 added foo to foo | () public @@ -685,37 +682,37 @@ () public $ hg obslog -r . - @ 13015a180eee (14) y to y and foobar to foo + @ 694790041d7d (17) y to y and foobar to foo | - x 211ab84d1689 (13) y to y and foobar to foo - | rewritten(content) as 13015a180eee using amend by test (Thu Jan 01 00:00:00 1970 +0000) + x 9195657992dd (15) y to y and foobar to foo + | rewritten(content) as 694790041d7d by test (Thu Jan 01 00:00:00 1970 +0000) | - o dc88f5aa9bc9 (12) y to y and foobar to foo - rewritten(parent) as 211ab84d1689 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) + o 43dd61d1a393 (14) y to y and foobar to foo + rewritten(parent) as 9195657992dd by test (Thu Jan 01 00:00:00 1970 +0000) Resolving divergence using `hg evolve` ------------------------------------- $ hg evolve --phase-divergent - recreate:[14] y to y and foobar to foo - atop:[12] y to y and foobar to foo - rebasing to destination parent: 2352021b3785 + recreate:[17] y to y and foobar to foo + atop:[14] y to y and foobar to foo + rebasing to destination parent: ae81846887bc computing new diff - committed as 8c2bb6fb44e9 - working directory is now at 8c2bb6fb44e9 + committed as 8da44ebfc416 + working directory is now at 8da44ebfc416 $ hg exp # HG changeset patch # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 - # Node ID 8c2bb6fb44e9443c64b3a2a3d061272c8e25e6ce - # Parent dc88f5aa9bc90a6418899d267d9524205dfb429b - phase-divergent update to dc88f5aa9bc9: + # Node ID 8da44ebfc416e3a6fc52c29f3a78e1d87c0d492e + # Parent 43dd61d1a393577a202514a924148969b8f74db8 + bumped update to 43dd61d1a393: y to y and foobar to foo - diff -r dc88f5aa9bc9 -r 8c2bb6fb44e9 y + diff -r 43dd61d1a393 -r 8da44ebfc416 y --- a/y Thu Jan 01 00:00:00 1970 +0000 +++ b/y Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +1,1 @@ @@ -723,17 +720,17 @@ +foo $ hg glog - @ 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9: + @ 19:8da44ebfc416 bumped update to 43dd61d1a393: | () draft - o 12:dc88f5aa9bc9 y to y and foobar to foo + o 14:43dd61d1a393 y to y and foobar to foo | () public - o 9:2352021b3785 added x to x + o 11:ae81846887bc added x to x | (bm) public - o 8:502e73736632 phase-divergent update to b756eb10ea73: + o 10:73f67b6cf2c4 bumped update to 6176b60d16d2: | () public - o 6:b756eb10ea73 added bar to bar + o 7:6176b60d16d2 added bar to bar | () public - o 5:3d62500c673d phase-divergent update to aa071e5554e3: + o 6:bdf645eb43bb bumped update to aa071e5554e3: | () public o 3:aa071e5554e3 added foo to foo | () public @@ -749,32 +746,32 @@ $ echo l > l $ hg ci -Aqm "added l to l" $ hg rebase -r . -d .^^^^ - rebasing 17:f3794e5a91dc "added l to l" (tip) + rebasing 20:515507bedb51 "added l to l" (tip) $ echo kl > l $ echo foo > x $ hg add x $ hg amend $ hg obslog -r . - @ 5fd38c0de46e (19) added l to l + @ e3c208c26c0c (23) added l to l | - x 2bfd56949cf0 (18) added l to l - | rewritten(content) as 5fd38c0de46e using amend by test (Thu Jan 01 00:00:00 1970 +0000) + x c114000165ef (21) added l to l + | rewritten(content) as e3c208c26c0c by test (Thu Jan 01 00:00:00 1970 +0000) | - x f3794e5a91dc (17) added l to l - rewritten(parent) as 2bfd56949cf0 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) + x 515507bedb51 (20) added l to l + rewritten(parent) as c114000165ef by test (Thu Jan 01 00:00:00 1970 +0000) - $ hg phase -r f3794e5a91dc --public --hidden - 1 new phase-divergent changesets + $ hg phase -r 515507bedb51 --public --hidden + 1 new bumped changesets Resolution using `hg evolve --phase-divergent` ---------------------------------------------- $ hg evolve --phase-divergent - recreate:[19] added l to l - atop:[17] added l to l - rebasing to destination parent: 8c2bb6fb44e9 + recreate:[23] added l to l + atop:[20] added l to l + rebasing to destination parent: 8da44ebfc416 merging x warning: conflicts while merging x! (edit, then use 'hg resolve --mark') evolution failed! @@ -783,20 +780,20 @@ [255] $ hg diff - diff -r 8c2bb6fb44e9 l + diff -r 8da44ebfc416 l --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/l Thu Jan 01 00:00:00 1970 +0000 @@ -0,0 +1,1 @@ +kl - diff -r 8c2bb6fb44e9 x + diff -r 8da44ebfc416 x --- a/x Thu Jan 01 00:00:00 1970 +0000 +++ b/x Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +1,5 @@ - +<<<<<<< destination: 8c2bb6fb44e9 - test: phase-divergent update to dc88f5aa9... + +<<<<<<< destination: 8da44ebfc416 - test: bumped update to 43dd61d1a393: x +======= +foo - +>>>>>>> evolving: 5fd38c0de46e - test: added l to l + +>>>>>>> evolving: e3c208c26c0c - test: added l to l $ echo foo > x @@ -805,27 +802,27 @@ continue: hg evolve --continue $ hg evolve --continue - evolving 19:5fd38c0de46e "added l to l" + evolving 23:e3c208c26c0c "added l to l" computing new diff - committed as e3090241a10c - working directory is now at e3090241a10c + committed as 01e0d829c156 + working directory is now at 01e0d829c156 $ hg glog - @ 21:e3090241a10c phase-divergent update to f3794e5a91dc: + @ 25:01e0d829c156 bumped update to 515507bedb51: | () draft - o 17:f3794e5a91dc added l to l + o 20:515507bedb51 added l to l | () public - o 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9: + o 19:8da44ebfc416 bumped update to 43dd61d1a393: | () public - o 12:dc88f5aa9bc9 y to y and foobar to foo + o 14:43dd61d1a393 y to y and foobar to foo | () public - o 9:2352021b3785 added x to x + o 11:ae81846887bc added x to x | (bm) public - o 8:502e73736632 phase-divergent update to b756eb10ea73: + o 10:73f67b6cf2c4 bumped update to 6176b60d16d2: | () public - o 6:b756eb10ea73 added bar to bar + o 7:6176b60d16d2 added bar to bar | () public - o 5:3d62500c673d phase-divergent update to aa071e5554e3: + o 6:bdf645eb43bb bumped update to aa071e5554e3: | () public o 3:aa071e5554e3 added foo to foo | () public @@ -839,19 +836,19 @@ # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 - # Node ID e3090241a10c320b6132e4673915fd6b19c0de39 - # Parent f3794e5a91dc1d4d36fee5c423386b19433a1f48 - phase-divergent update to f3794e5a91dc: + # Node ID 01e0d829c1560d8297062062dff671e272439e38 + # Parent 515507bedb512ac15258c2ab44809645139055ef + bumped update to 515507bedb51: added l to l - diff -r f3794e5a91dc -r e3090241a10c l + diff -r 515507bedb51 -r 01e0d829c156 l --- a/l Thu Jan 01 00:00:00 1970 +0000 +++ b/l Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +1,1 @@ -l +kl - diff -r f3794e5a91dc -r e3090241a10c x + diff -r 515507bedb51 -r 01e0d829c156 x --- a/x Thu Jan 01 00:00:00 1970 +0000 +++ b/x Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +1,1 @@ @@ -862,7 +859,7 @@ ------------------------------------------------------------------------ $ hg glog -r . - @ 21:e3090241a10c phase-divergent update to f3794e5a91dc: + @ 25:01e0d829c156 bumped update to 515507bedb51: | () draft ~ $ echo f > f @@ -876,45 +873,45 @@ $ hg evolve --list - $ hg phase -r 428f7900a969 --public --hidden - 1 new phase-divergent changesets + $ hg phase -r e86ee52bfd76 --public --hidden + 1 new bumped changesets - $ hg glog -r f3794e5a91dc:: - @ 24:e450d05b7d27 added g + $ hg glog -r 515507bedb51:: + @ 28:d83c51bdc098 added g | () draft - | o 23:428f7900a969 added g + | o 27:e86ee52bfd76 added g | | () public - | o 22:21ae52e414e6 added f + | o 26:d3c143cd906e added f |/ () public - o 21:e3090241a10c phase-divergent update to f3794e5a91dc: + o 25:01e0d829c156 bumped update to 515507bedb51: | () public - o 17:f3794e5a91dc added l to l + o 20:515507bedb51 added l to l | () public ~ $ hg evolve --list - e450d05b7d27: added g - phase-divergent: 21ae52e414e6 (immutable precursor) - phase-divergent: 428f7900a969 (immutable precursor) + d83c51bdc098: added g + bumped: d3c143cd906e (immutable precursor) + bumped: e86ee52bfd76 (immutable precursor) Resolving phase divergence using `hg evolve` $ hg evolve --phase-divergent --all - recreate:[24] added g - atop:[23] added g - rebasing to destination parent: 21ae52e414e6 + recreate:[28] added g + atop:[27] added g + rebasing to destination parent: d3c143cd906e computing new diff - committed as 428f7900a969 - working directory is now at 428f7900a969 + committed as e86ee52bfd76 + working directory is now at e86ee52bfd76 - $ hg glog -r f3794e5a91dc:: - @ 23:428f7900a969 added g + $ hg glog -r 515507bedb51:: + @ 27:e86ee52bfd76 added g | () public - o 22:21ae52e414e6 added f + o 26:d3c143cd906e added f | () public - o 21:e3090241a10c phase-divergent update to f3794e5a91dc: + o 25:01e0d829c156 bumped update to 515507bedb51: | () public - o 17:f3794e5a91dc added l to l + o 20:515507bedb51 added l to l | () public ~ @@ -925,112 +922,112 @@ $ echo n > n $ hg ci -Aqm "added m and n" - $ hg glog -r 21ae52e414e6:: - @ 26:849cee0a874b added m and n + $ hg glog -r d3c143cd906e:: + @ 30:bbb1ce6e7cb5 added m and n | () draft - o 23:428f7900a969 added g + o 27:e86ee52bfd76 added g | () public - o 22:21ae52e414e6 added f + o 26:d3c143cd906e added f | () public ~ $ hg prev 0 files updated, 0 files merged, 2 files removed, 0 files unresolved - [23] added g + [27] added g $ echo m > m $ hg ci -Aqm "added m" $ echo n > n $ hg ci -Aqm "added n" - $ hg glog -r 428f7900a969:: - @ 28:63ccb8ea7cae added n + $ hg glog -r e86ee52bfd76:: + @ 32:e1e84fb7bd8c added n | () draft - o 27:f313e2b90e70 added m + o 31:38f8157363bc added m | () draft - | o 26:849cee0a874b added m and n + | o 30:bbb1ce6e7cb5 added m and n |/ () draft - o 23:428f7900a969 added g + o 27:e86ee52bfd76 added g | () public ~ - $ hg prune -r 849cee0a874b --succ f313e2b90e70 --succ 63ccb8ea7cae --split + $ hg prune -r bbb1ce6e7cb5 --succ 38f8157363bc --succ e1e84fb7bd8c --split 1 changesets pruned - $ hg phase -r 849cee0a874b --hidden --public - 2 new phase-divergent changesets + $ hg phase -r bbb1ce6e7cb5 --hidden --public + 2 new bumped changesets - $ hg glog -r 428f7900a969:: - @ 28:63ccb8ea7cae added n + $ hg glog -r e86ee52bfd76:: + @ 32:e1e84fb7bd8c added n | () draft - o 27:f313e2b90e70 added m + o 31:38f8157363bc added m | () draft - | o 26:849cee0a874b added m and n + | o 30:bbb1ce6e7cb5 added m and n |/ () public - o 23:428f7900a969 added g + o 27:e86ee52bfd76 added g | () public ~ $ hg evolve --all --phase-divergent - recreate:[27] added m - atop:[26] added m and n + recreate:[31] added m + atop:[30] added m and n computing new diff - committed as 870e1c3eddc3 - recreate:[28] added n - atop:[26] added m and n - rebasing to destination parent: 428f7900a969 + committed as 26c0e0acbf58 + recreate:[32] added n + atop:[30] added m and n + rebasing to destination parent: e86ee52bfd76 computing new diff - committed as 154b0179fb9b - working directory is now at 154b0179fb9b + committed as 167994483a30 + working directory is now at 167994483a30 XXX: this is messy, we should solve things in better way - $ hg glog -r 428f7900a969:: --hidden - @ 31:154b0179fb9b phase-divergent update to 849cee0a874b: + $ hg glog -r e86ee52bfd76:: --hidden + @ 35:167994483a30 bumped update to bbb1ce6e7cb5: | () draft - | x 30:1ebf33547a82 added n + | x 34:ebca40be1c77 added n | | () draft - +---o 29:870e1c3eddc3 phase-divergent update to 849cee0a874b: + +---o 33:26c0e0acbf58 bumped update to bbb1ce6e7cb5: | | () draft - | | x 28:63ccb8ea7cae added n + | | x 32:e1e84fb7bd8c added n | | | () draft - | | x 27:f313e2b90e70 added m + | | x 31:38f8157363bc added m | |/ () draft - o | 26:849cee0a874b added m and n + o | 30:bbb1ce6e7cb5 added m and n |/ () public - o 23:428f7900a969 added g + o 27:e86ee52bfd76 added g | () public ~ XXX: not sure this is the correct - $ hg exp 154b0179fb9b + $ hg exp 167994483a30 # HG changeset patch # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 - # Node ID 154b0179fb9b53d2f853d6ba04740bb3d7a5cabe - # Parent 849cee0a874be7c4e75dfacb5ad72aa5696951ba - phase-divergent update to 849cee0a874b: + # Node ID 167994483a3052f6ea76aa4ba54bd0d6ecd03506 + # Parent bbb1ce6e7cb56a4d0ddd9b602492c1e79f2beaf5 + bumped update to bbb1ce6e7cb5: added n - diff -r 849cee0a874b -r 154b0179fb9b m + diff -r bbb1ce6e7cb5 -r 167994483a30 m --- a/m Thu Jan 01 00:00:00 1970 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -m XXX: not sure this is correct - $ hg exp 870e1c3eddc3 + $ hg exp 26c0e0acbf58 --hidden # HG changeset patch # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 - # Node ID 870e1c3eddc34cc475e8e13d2fe1934210c1937e - # Parent 849cee0a874be7c4e75dfacb5ad72aa5696951ba - phase-divergent update to 849cee0a874b: + # Node ID 26c0e0acbf58e4bd2a2414e43b7d2d8aefdbba60 + # Parent bbb1ce6e7cb56a4d0ddd9b602492c1e79f2beaf5 + bumped update to bbb1ce6e7cb5: added m - diff -r 849cee0a874b -r 870e1c3eddc3 n + diff -r bbb1ce6e7cb5 -r 26c0e0acbf58 n --- a/n Thu Jan 01 00:00:00 1970 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ @@ -1045,107 +1042,107 @@ $ hg prev 0 files updated, 0 files merged, 2 files removed, 0 files unresolved - [31] phase-divergent update to 849cee0a874b: + [35] bumped update to bbb1ce6e7cb5: $ echo p > p $ hg ci -Aqm "added p" $ hg prev 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - [31] phase-divergent update to 849cee0a874b: + [35] bumped update to bbb1ce6e7cb5: $ echo q > q $ hg ci -Aqm "added q" - $ hg glog -r 154b0179fb9b:: - @ 34:e046341aa97c added q + $ hg glog -r 167994483a30:: + @ 38:25009377929c added q | () draft - | o 33:6f8c250eecff added p + | o 37:a27f3cc92c8f added p |/ () draft - | o 32:8a70f55b2af3 added p and q + | o 36:f695c2c8812d added p and q |/ () draft - o 31:154b0179fb9b phase-divergent update to 849cee0a874b: + o 35:167994483a30 bumped update to bbb1ce6e7cb5: | () draft ~ - $ hg prune -r 8a70f55b2af3 --succ 6f8c250eecff --succ e046341aa97c --split + $ hg prune -r f695c2c8812d --succ a27f3cc92c8f --succ 25009377929c --split 1 changesets pruned - $ hg phase -r 8a70f55b2af3 --public --hidden - 2 new phase-divergent changesets + $ hg phase -r f695c2c8812d --public --hidden + 2 new bumped changesets - $ hg glog -r 154b0179fb9b:: - @ 34:e046341aa97c added q + $ hg glog -r 167994483a30:: + @ 38:25009377929c added q | () draft - | o 33:6f8c250eecff added p + | o 37:a27f3cc92c8f added p |/ () draft - | o 32:8a70f55b2af3 added p and q + | o 36:f695c2c8812d added p and q |/ () public - o 31:154b0179fb9b phase-divergent update to 849cee0a874b: + o 35:167994483a30 bumped update to bbb1ce6e7cb5: | () public ~ $ hg evolve --list - 6f8c250eecff: added p - phase-divergent: 8a70f55b2af3 (immutable precursor) + a27f3cc92c8f: added p + bumped: f695c2c8812d (immutable precursor) - e046341aa97c: added q - phase-divergent: 8a70f55b2af3 (immutable precursor) + 25009377929c: added q + bumped: f695c2c8812d (immutable precursor) $ hg evolve --all --phase-divergent - recreate:[33] added p - atop:[32] added p and q + recreate:[37] added p + atop:[36] added p and q computing new diff - committed as f3e41d89b3c5 - recreate:[34] added q - atop:[32] added p and q + committed as abd19926ab01 + recreate:[38] added q + atop:[36] added p and q computing new diff - committed as 605c306d4f87 - working directory is now at 605c306d4f87 + committed as 12c31db4edf9 + working directory is now at 12c31db4edf9 - $ hg glog -r 154b0179fb9b:: --hidden - @ 36:605c306d4f87 phase-divergent update to 8a70f55b2af3: + $ hg glog -r 167994483a30:: --hidden + @ 40:12c31db4edf9 bumped update to f695c2c8812d: | () draft - | o 35:f3e41d89b3c5 phase-divergent update to 8a70f55b2af3: + | o 39:abd19926ab01 bumped update to f695c2c8812d: |/ () draft - | x 34:e046341aa97c added q + | x 38:25009377929c added q | | () draft - | | x 33:6f8c250eecff added p + | | x 37:a27f3cc92c8f added p | |/ () draft - o | 32:8a70f55b2af3 added p and q + o | 36:f695c2c8812d added p and q |/ () public - o 31:154b0179fb9b phase-divergent update to 849cee0a874b: + o 35:167994483a30 bumped update to bbb1ce6e7cb5: | () public ~ XXX: not sure this is correct - $ hg exp 605c306d4f87 + $ hg exp 12c31db4edf9 # HG changeset patch # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 - # Node ID 605c306d4f87fccfdb5e7dd1c750b6d4f813defb - # Parent 8a70f55b2af35452916dc89401a5ecf6553646a5 - phase-divergent update to 8a70f55b2af3: + # Node ID 12c31db4edf9a889e3ce9986f484bbf939f4fb42 + # Parent f695c2c8812d12a910a47440ee189e553326a1c8 + bumped update to f695c2c8812d: added q - diff -r 8a70f55b2af3 -r 605c306d4f87 p + diff -r f695c2c8812d -r 12c31db4edf9 p --- a/p Thu Jan 01 00:00:00 1970 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -p XXX: not sure this is correct - $ hg exp f3e41d89b3c5 + $ hg exp abd19926ab01 # HG changeset patch # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 - # Node ID f3e41d89b3c5f6ee49ccc734045856d7b025f048 - # Parent 8a70f55b2af35452916dc89401a5ecf6553646a5 - phase-divergent update to 8a70f55b2af3: + # Node ID abd19926ab0109f43f38e732cfa8ae747e2e4187 + # Parent f695c2c8812d12a910a47440ee189e553326a1c8 + bumped update to f695c2c8812d: added p - diff -r 8a70f55b2af3 -r f3e41d89b3c5 q + diff -r f695c2c8812d -r abd19926ab01 q --- a/q Thu Jan 01 00:00:00 1970 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ @@ -1154,14 +1151,14 @@ Testing the evolution of a phase-divergent merge with no conflicts ------------------------------------------------------------------ - $ hg glog -r 154b0179fb9b:: - @ 36:605c306d4f87 phase-divergent update to 8a70f55b2af3: + $ hg glog -r 167994483a30:: + @ 40:12c31db4edf9 bumped update to f695c2c8812d: | () draft - | o 35:f3e41d89b3c5 phase-divergent update to 8a70f55b2af3: + | o 39:abd19926ab01 bumped update to f695c2c8812d: |/ () draft - o 32:8a70f55b2af3 added p and q + o 36:f695c2c8812d added p and q | () public - o 31:154b0179fb9b phase-divergent update to 849cee0a874b: + o 35:167994483a30 bumped update to bbb1ce6e7cb5: | () public ~ @@ -1169,53 +1166,53 @@ $ hg ci -Aqm "added h" $ hg prev 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - [36] phase-divergent update to 8a70f55b2af3: + [40] bumped update to f695c2c8812d: $ echo i > i $ hg ci -Aqm "added i" - $ hg merge -r ef8c23f37b55 + $ hg merge -r 'desc("added h")' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg ci -m "merge h and i" - $ hg glog -r 605c306d4f87:: - @ 39:12ebe0d625d7 merge h and i + $ hg glog -r 12c31db4edf9:: + @ 43:98ce636fa344 merge h and i |\ () draft - | o 38:9bb561db4230 added i + | o 42:c13ebd59dd4e added i | | () draft - o | 37:ef8c23f37b55 added h + o | 41:10bb6c8a838f added h |/ () draft - o 36:605c306d4f87 phase-divergent update to 8a70f55b2af3: + o 40:12c31db4edf9 bumped update to f695c2c8812d: | () draft ~ - $ hg up ef8c23f37b55 + $ hg up 10bb6c8a838f 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg merge -r 9bb561db4230 + $ hg merge -r c13ebd59dd4e 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg ci -m "merge h and i successor" created new head - $ hg glog -r 605c306d4f87:: - @ 40:d2aeda868461 merge h and i successor + $ hg glog -r 12c31db4edf9:: + @ 44:57c7c43469f2 merge h and i successor |\ () draft - +---o 39:12ebe0d625d7 merge h and i + +---o 43:98ce636fa344 merge h and i | |/ () draft - | o 38:9bb561db4230 added i + | o 42:c13ebd59dd4e added i | | () draft - o | 37:ef8c23f37b55 added h + o | 41:10bb6c8a838f added h |/ () draft - o 36:605c306d4f87 phase-divergent update to 8a70f55b2af3: + o 40:12c31db4edf9 bumped update to f695c2c8812d: | () draft ~ - $ hg prune -r 12ebe0d625d7 --succ . + $ hg prune -r 98ce636fa344 --succ . 1 changesets pruned - $ hg phase 12ebe0d625d7 --hidden --public + $ hg phase 98ce636fa344 --hidden --public 1 new bumped changesets Resolution of phase-divergent merge commit using `hg evolve` XXX: we should handle phase-divergent merges $ hg evolve --phase-divergent - skipping d2aeda868461 : we do not handle merge yet + skipping 57c7c43469f2 : we do not handle merge yet
--- a/tests/test-evolve.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-evolve.t Wed Apr 25 01:58:45 2018 +0100 @@ -622,8 +622,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 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'} + db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'} Test grab --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 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'} + db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'} + a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 fb2c0f0a0c54be4367988521bad2cbd33a540969 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'user': 'test'} Test touch @@ -769,14 +769,14 @@ $ hg olog | head -n 10 # hg touch makes the output unstable (fix it with devel option for more stable touch) @ d26d339c513f (12) add 4 |\ - x | af636757ce3b (11) add 3 - |\ \ rewritten as d26d339c513f by test (Thu Jan 01 00:00:00 1970 +0000) - | | | - | \ \ - | |\ \ - | | | x ce341209337f (4) add 4 - | | | rewritten as d26d339c513f by test (Thu Jan 01 00:00:00 1970 +0000) - | | | + x | ce341209337f (4) add 4 + / rewritten(description, user, content) as d26d339c513f by test (Thu Jan 01 00:00:00 1970 +0000) + | + x cf0c3904643c (11) add 3 + |\ rewritten(description, user, parent, content) as d26d339c513f by test (Thu Jan 01 00:00:00 1970 +0000) + | | + | \ + | |\ 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: 72 + longer length: 73 + median length: 73 + mean length: 72 disconnected clusters: 1 any known node: 1 smallest length: 10
--- a/tests/test-exchange-obsmarkers-case-B1.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-B1.t Wed Apr 25 01:58:45 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pushdest # obstore: pulldest
--- a/tests/test-exchange-obsmarkers-case-B2.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-B2.t Wed Apr 25 01:58:45 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pushdest - f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pushdest - f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pulldest - f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pushdest - f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pushdest - f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pulldest - f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-B3.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-B3.t Wed Apr 25 01:58:45 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pushdest # obstore: pulldest
--- a/tests/test-exchange-obsmarkers-case-B4.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-B4.t Wed Apr 25 01:58:45 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pushdest - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pushdest - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pulldest - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pushdest - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pushdest - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pulldest - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-B5.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-B5.t Wed Apr 25 01:58:45 2018 +0100 @@ -94,27 +94,27 @@ 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'} + 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 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,7 +126,7 @@ # testing echange of "C" (1d0f3cd25300) ## initial state # obstore: main - 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (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 (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'} @@ -142,7 +142,7 @@ remote: 1 new obsolescence markers ## post push state # obstore: main - 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (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 (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'} @@ -160,7 +160,7 @@ (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'} + 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', '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'}
--- a/tests/test-exchange-obsmarkers-case-B6.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-B6.t Wed Apr 25 01:58:45 2018 +0100 @@ -72,18 +72,18 @@ 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'} + f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 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 .. @@ -97,7 +97,7 @@ ## 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'} + f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pushdest # obstore: pulldest ## pushing "O" from main to pushdest @@ -108,10 +108,10 @@ ## 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'} + f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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'} + f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pulldest ## pulling "a9bdc8b26820" from main into pulldest pulling from main @@ -120,11 +120,11 @@ ## 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'} + f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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'} + f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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'} + f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-B7.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-B7.t Wed Apr 25 01:58:45 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pushdest # obstore: pulldest
--- a/tests/test-exchange-obsmarkers-case-C1.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-C1.t Wed Apr 25 01:58:45 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-C2.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-C2.t Wed Apr 25 01:58:45 2018 +0100 @@ -75,20 +75,20 @@ $ inspect_obsmarkers obsstore content ================ - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 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,7 +103,7 @@ # testing echange of "A1" (e5ea8f9c7314) ## initial state # obstore: main - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} # obstore: pushdest # obstore: pulldest @@ -117,10 +117,10 @@ remote: 2 new obsolescence markers ## post push state # obstore: main - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} # obstore: pushdest - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} # obstore: pulldest ## pulling "e5ea8f9c7314" from main into pulldest @@ -134,13 +134,13 @@ (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'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} # obstore: pushdest - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} # obstore: pulldest - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} Actual Test (bare push) @@ -150,7 +150,7 @@ ## Running testcase C.2.b ## initial state # obstore: main - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} # obstore: pushdest # obstore: pulldest @@ -164,10 +164,10 @@ remote: 2 new obsolescence markers ## post push state # obstore: main - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} # obstore: pushdest - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} # obstore: pulldest ## pulling from main into pulldest @@ -181,11 +181,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'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} # obstore: pushdest - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} # obstore: pulldest - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-C3.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-C3.t Wed Apr 25 01:58:45 2018 +0100 @@ -78,19 +78,19 @@ $ inspect_obsmarkers obsstore content ================ - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', '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'} + e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 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 +105,9 @@ # testing echange of "O" (a9bdc8b26820) ## initial state # obstore: main - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', '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'} + e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pushdest # obstore: pulldest ## pushing "O" from main to pushdest @@ -117,13 +117,13 @@ remote: 3 new obsolescence markers ## post push state # obstore: main - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', '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'} + e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pushdest - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', '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'} + e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pulldest ## pulling "a9bdc8b26820" from main into pulldest pulling from main @@ -131,17 +131,17 @@ 3 new obsolescence markers ## post pull state # obstore: main - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', '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'} + e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pushdest - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', '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'} + e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pulldest - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', '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'} + e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} Actual Test (bare push) ------------------------------------- @@ -150,9 +150,9 @@ ## Running testcase C.3.b ## initial state # obstore: main - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', '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'} + e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pushdest # obstore: pulldest ## pushing from main to pushdest @@ -162,13 +162,13 @@ remote: 3 new obsolescence markers ## post push state # obstore: main - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', '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'} + e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pushdest - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', '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'} + e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pulldest ## pulling from main into pulldest pulling from main @@ -177,14 +177,14 @@ 3 new obsolescence markers ## post pull state # obstore: main - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', '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'} + e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pushdest - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', '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'} + e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pulldest - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', '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'} + e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-C4.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-C4.t Wed Apr 25 01:58:45 2018 +0100 @@ -82,19 +82,19 @@ ================ 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'} + 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 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,7 +106,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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', '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'} # obstore: pushdest @@ -118,11 +118,11 @@ remote: 2 new obsolescence markers ## post push state # obstore: main - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', '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'} # obstore: pushdest - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} # obstore: pulldest ## pulling "a9bdc8b26820" from main into pulldest @@ -131,12 +131,12 @@ 2 new obsolescence markers ## post pull state # obstore: main - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', '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'} # obstore: pushdest - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} # obstore: pulldest - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-D1.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-D1.t Wed Apr 25 01:58:45 2018 +0100 @@ -74,17 +74,17 @@ 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'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 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,7 +99,7 @@ # testing echange of "A1" (e5ea8f9c7314) ## initial state # obstore: main - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} # obstore: pushdest # obstore: pulldest @@ -113,10 +113,10 @@ remote: 2 new obsolescence markers ## post push state # obstore: main - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} # obstore: pushdest - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} # obstore: pulldest ## pulling "e5ea8f9c7314" from main into pulldest @@ -130,13 +130,13 @@ (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'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} # obstore: pushdest - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} # obstore: pulldest - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} Actual Test (base push) @@ -146,7 +146,7 @@ ## Running testcase D.1.b ## initial state # obstore: main - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} # obstore: pushdest # obstore: pulldest @@ -160,10 +160,10 @@ remote: 2 new obsolescence markers ## post push state # obstore: main - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} # obstore: pushdest - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} # obstore: pulldest ## pulling from main into pulldest @@ -177,12 +177,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'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} # obstore: pushdest - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} # obstore: pulldest - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-D2.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-D2.t Wed Apr 25 01:58:45 2018 +0100 @@ -69,15 +69,15 @@ 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'} + e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 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 .. @@ -89,7 +89,7 @@ ## 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'} + e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pushdest # obstore: pulldest ## pushing from main to pushdest @@ -100,10 +100,10 @@ ## 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'} + e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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'} + e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pulldest ## pulling from main into pulldest pulling from main @@ -113,11 +113,11 @@ ## 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'} + e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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'} + e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # 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'} + e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-D3.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-D3.t Wed Apr 25 01:58:45 2018 +0100 @@ -74,17 +74,17 @@ 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'} + 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 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 .. @@ -98,7 +98,7 @@ ## 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'} + 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pushdest # obstore: pulldest ## pushing "O" from main to pushdest @@ -108,7 +108,7 @@ ## 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'} + 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pushdest # obstore: pulldest ## pulling "a9bdc8b26820" from main into pulldest @@ -117,7 +117,7 @@ ## 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'} + 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} # obstore: pushdest # obstore: pulldest
--- a/tests/test-metaedit.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-metaedit.t Wed Apr 25 01:58:45 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 (Thu Jan 01 00:00:00 1970 +0000) | | 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 (Thu Jan 01 00:00:00 1970 +0000) | 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 (Thu Jan 01 00:00:00 1970 +0000) no new commit is created here because the date is the same
--- a/tests/test-prune.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-prune.t Wed Apr 25 01:58:45 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': '0', 'user': 'blah'} 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': '0', 'user': 'blah'} + 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 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': '0', 'user': 'blah'} + 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 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': '0', 'user': 'blah'} + 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} 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': '0', 'user': 'blah'} + 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'} $ 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': '0', 'user': 'blah'} + 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'} + 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'} $ 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': '0', 'user': 'blah'} + 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'} + 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'} 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': '0', 'user': 'blah'} + 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'} + 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'} + 814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'user': 'test'} + 354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'} 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': '0', 'user': 'blah'} + 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'} + 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'} + 814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'user': 'test'} + 354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'} + cb7f8f706a6532967b98cf8583a81baab79a0fa7 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'} + 21b6f2f1cece8c10326e575dd38239189d467190 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'} 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: 96 + longer length: 96 + median length: 96 + mean length: 96 disconnected clusters: 7 any known node: 7 smallest length: 1
--- a/tests/test-split.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-split.t Wed Apr 25 01:58:45 2018 +0100 @@ -94,7 +94,7 @@ $ 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'} + d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'} $ 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 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'} 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 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'} + 033b3f5ae73db67c10de938fb6f26b949aaef172 bb5e4f6020c74e7961a51fda635ea9df9b04dda8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'} + b434287e665ce757ee5463a965cb3d119ca9e893 ead2066d1dbf14833fe1069df1b735e4e9468c40 1188c4216eba37f18a1de6558564601d00ff2143 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'} $ hg evolve --all move:[10] split1 atop:[13] split4
--- a/tests/test-stabilize-order.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-stabilize-order.t Wed Apr 25 01:58:45 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 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'} + +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'} [1]
--- a/tests/test-stabilize-result.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-stabilize-result.t Wed Apr 25 01:58:45 2018 +0100 @@ -56,7 +56,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} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} Test evolve with conflict @@ -178,10 +178,10 @@ perform evolve? [Ny] y rebasing to destination parent: 66719795a494 computing new diff - committed as e34e87ea7b83 - working directory is now at e34e87ea7b83 + committed as cd735a3aeb32 + working directory is now at cd735a3aeb32 $ glog - @ 14:e34e87ea7b83@default(draft) bk:[] bumped update to 1cf0aacfd363: + @ 14:cd735a3aeb32@default(draft) bk:[] bumped update to 1cf0aacfd363: | | o 9:7bc2f5967f5e@default(draft) bk:[] add c | | @@ -196,13 +196,13 @@ # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 - # Node ID 8fc63fe1f297f356d1156bbbbe865b9911efad74 + # Node ID cd735a3aeb32e80b92f780c4ace1650597d581b2 # Parent 1cf0aacfd36310b18e403e1594871187e0364a82 - phase-divergent update to 1cf0aacfd363: + bumped update to 1cf0aacfd363: newer a - diff -r 1cf0aacfd363 -r 8fc63fe1f297 a + diff -r 1cf0aacfd363 -r cd735a3aeb32 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 @@
--- a/tests/test-topic-stack.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-topic-stack.t Wed Apr 25 01:58:45 2018 +0100 @@ -861,7 +861,7 @@ | @ 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 (Thu Jan 01 00:00:00 1970 +0000) | x 907f7d3c2333 (18) c_G | rewritten as b24bab30ac12 by test (Thu Jan 01 00:00:00 1970 +0000)
--- a/tests/test-uncommit-interactive.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-uncommit-interactive.t Wed Apr 25 01:58:45 2018 +0100 @@ -170,7 +170,7 @@ @ 678a59e5ff90 (3) another one | x f70fb463d5bf (1) another one - rewritten as 678a59e5ff90 by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(content) 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 @@ -303,11 +303,11 @@ @ 46e35360be47 (5) another one | x 678a59e5ff90 (3) another one - | rewritten as 46e35360be47 by test (Thu Jan 01 00:00:00 1970 +0000) + | rewritten(content) 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) + rewritten(content) as 678a59e5ff90 by test (Thu Jan 01 00:00:00 1970 +0000) note: note on amend --extract
--- a/tests/test-uncommit.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-uncommit.t Wed Apr 25 01:58:45 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 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'} 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 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'} + 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'} 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 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'} + 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'} + 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'} 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 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'} + 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'} + 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'} + c4cbebac3751269bdf12d1466deabcc78521d272 4f1c269eab68720f54e88ce3c1dc02b2858b6b89 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'} Test instability warning
--- a/tests/test-wireproto.t Mon Apr 23 12:23:00 2018 +0200 +++ b/tests/test-wireproto.t Wed Apr 25 01:58:45 2018 +0100 @@ -138,7 +138,7 @@ 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: 226 bytes received remote: 1 new obsolescence markers remote: obsoleted 1 changesets $ hg -R ../other pull @@ -148,7 +148,7 @@ adding manifests adding file changes added 1 changesets with 0 changes to 1 files (+1 heads) - obsmarker-exchange: 220 bytes received + obsmarker-exchange: 226 bytes received 1 new obsolescence markers obsoleted 1 changesets (run 'hg heads' to see heads) @@ -173,7 +173,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: 376 bytes received [1] $ hg -R ../other pull --config experimental.evolution.obsdiscovery=no pulling from ssh://user@dummy/server @@ -181,7 +181,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: 376 bytes received $ cd .. @@ -211,7 +211,7 @@ pulling from http://localhost:$HGPORT/ searching for changes no changes found - obsmarker-exchange: 370 bytes received + obsmarker-exchange: 376 bytes received $ hg -R client pull http://localhost:$HGPORT/ --config experimental.evolution=createmarkers pulling from http://localhost:$HGPORT/