diff -r 0471b9ddd0b2 -r 844b1ad5b34b tests/test-evolve-content-divergent-corner-cases.t --- a/tests/test-evolve-content-divergent-corner-cases.t Wed Apr 08 01:17:01 2020 +0800 +++ b/tests/test-evolve-content-divergent-corner-cases.t Fri May 08 22:50:09 2020 +0800 @@ -79,12 +79,31 @@ with: [3] divergent base: [1] added b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory is now at 45bf1312f454 + working directory is now at 98ab969ac8fb $ hg log -G - @ 4:45bf1312f454@default(draft) divergent [] + @ 4:98ab969ac8fb@default(draft) divergent [] | o 0:9092f1db7931@default(draft) added a [] + $ hg debugobsolete + 5f6d8a4bf34ab274ccc9f631c2536964b8a3666d 8374d2ddc3a4d48428c3d2f80e4fc86f13736f96 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} + 5f6d8a4bf34ab274ccc9f631c2536964b8a3666d 593c57f2117e33dd0884382f02789d948f548557 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} + 593c57f2117e33dd0884382f02789d948f548557 98ab969ac8fbe315e6d2c24a8eb5eab5b81e4242 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} + 8374d2ddc3a4d48428c3d2f80e4fc86f13736f96 98ab969ac8fbe315e6d2c24a8eb5eab5b81e4242 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} + $ hg obslog --all + @ 98ab969ac8fb (4) divergent + |\ amended(content) from 593c57f2117e using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | | amended(content) from 8374d2ddc3a4 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | | + x | 593c57f2117e (2) divergent + | | rewritten(description, content) from 5f6d8a4bf34a using prune by test (Thu Jan 01 00:00:00 1970 +0000) + | | + | x 8374d2ddc3a4 (3) divergent + |/ rewritten(description, content) from 5f6d8a4bf34a using prune by test (Thu Jan 01 00:00:00 1970 +0000) + | + x 5f6d8a4bf34a (1) added b + + Test divergence resolution when it yields to an empty commit (issue4950) cdivergent2 contains the same content than cdivergent1 and they are divergent versions of the revision _c @@ -113,7 +132,7 @@ |/ | o 5:48819a835615@default(draft) add _c [] |/ - | o 4:45bf1312f454@default(draft) divergent [] + | o 4:98ab969ac8fb@default(draft) divergent [] |/ o 0:9092f1db7931@default(draft) added a [] @@ -129,7 +148,7 @@ | | * 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent] |/ - | o 4:45bf1312f454@default(draft) divergent [] + | o 4:98ab969ac8fb@default(draft) divergent [] |/ o 0:9092f1db7931@default(draft) added a [] @@ -138,8 +157,37 @@ with: [7] add _c base: [5] add _c 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - nothing changed - working directory is now at e3ff64ce8d4c + working directory is now at 6b3776664a25 + + $ hg log -G + @ 8:6b3776664a25@default(draft) add cdivergent1 [] + | + | o 4:98ab969ac8fb@default(draft) divergent [] + |/ + o 0:9092f1db7931@default(draft) added a [] + + $ hg debugobsolete + 5f6d8a4bf34ab274ccc9f631c2536964b8a3666d 8374d2ddc3a4d48428c3d2f80e4fc86f13736f96 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} + 5f6d8a4bf34ab274ccc9f631c2536964b8a3666d 593c57f2117e33dd0884382f02789d948f548557 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} + 593c57f2117e33dd0884382f02789d948f548557 98ab969ac8fbe315e6d2c24a8eb5eab5b81e4242 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} + 8374d2ddc3a4d48428c3d2f80e4fc86f13736f96 98ab969ac8fbe315e6d2c24a8eb5eab5b81e4242 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} + 48819a83561596ef0aeac4082eaaa8afe4320f3a b2ae71172042972a8e8d2bc11e2b2fe4e0c3aa49 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'prune', 'user': 'test'} + 48819a83561596ef0aeac4082eaaa8afe4320f3a e3ff64ce8d4ce33b40d9f367a8ec472fec588ca3 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} + e3ff64ce8d4ce33b40d9f367a8ec472fec588ca3 6b3776664a258aa4c7e13f90df20ae9170995217 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} + b2ae71172042972a8e8d2bc11e2b2fe4e0c3aa49 6b3776664a258aa4c7e13f90df20ae9170995217 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'evolve', 'user': 'test'} + $ hg obslog --all + @ 6b3776664a25 (8) add cdivergent1 + |\ reworded(description) from b2ae71172042 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | | rewritten from e3ff64ce8d4c using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | | + x | b2ae71172042 (7) add _c + | | amended(content) from 48819a835615 using prune by test (Thu Jan 01 00:00:00 1970 +0000) + | | + | x e3ff64ce8d4c (6) add cdivergent1 + |/ rewritten(description, content) from 48819a835615 using prune by test (Thu Jan 01 00:00:00 1970 +0000) + | + x 48819a835615 (5) add _c + $ cd .. @@ -206,7 +254,31 @@ with: [3] bdivergent base: [1] add _b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory is now at 73ff357d3975 + working directory is now at b87e0354d5cb + + $ hg log -G + @ 4:b87e0354d5cb@default(draft) bdivergent [] + | + o 0:135f39f4bd78@default(draft) add _a [] + + $ hg debugobsolete + 37445b16603b50165d5eb80735fb986c72a2dac1 6b096fb450709a194b21fb9b192fe9b1572c4af0 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} + 37445b16603b50165d5eb80735fb986c72a2dac1 05a6b6a9e633802d2bdd06e6d292982a767d930e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} + 05a6b6a9e633802d2bdd06e6d292982a767d930e b87e0354d5cb081210298429d8b51de9871155a2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} + 6b096fb450709a194b21fb9b192fe9b1572c4af0 b87e0354d5cb081210298429d8b51de9871155a2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} + $ hg obslog --all + @ b87e0354d5cb (4) bdivergent + |\ amended(content) from 05a6b6a9e633 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | | amended(content) from 6b096fb45070 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | | + x | 05a6b6a9e633 (2) bdivergent + | | rewritten(description, content) from 37445b16603b using prune by test (Thu Jan 01 00:00:00 1970 +0000) + | | + | x 6b096fb45070 (3) bdivergent + |/ rewritten(description, content) from 37445b16603b using prune by test (Thu Jan 01 00:00:00 1970 +0000) + | + x 37445b16603b (1) add _b + $ cd .. @@ -283,13 +355,41 @@ other changed d which local deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c 0 files updated, 1 files merged, 0 files removed, 0 files unresolved - working directory is now at eb6357cd41b6 + working directory is now at 51ee71efed61 $ hg glog -l1 - @ 9:eb6357cd41b6 updated e + @ 9:51ee71efed61 updated e | () [default] draft ~ + $ hg debugobsolete + 8d71eadcc9dfb21a924e75a5796c2f011bdc55a4 ff6f7cd76a7c97d938e8fe87f0fc816b66929435 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} + 8d71eadcc9dfb21a924e75a5796c2f011bdc55a4 de4ea3103326293994c634101e780724346ee89f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} + 9150fe93bec603cd88d05cda9f6ff13420cb53e9 0 {155349b645beebee15325a9a22dd0c9ef8fbbbd3} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} + ff6f7cd76a7c97d938e8fe87f0fc816b66929435 0ceb21ca2557a61433f097e4d64024e37cae2c10 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} + de4ea3103326293994c634101e780724346ee89f a2465d1d56d1aee8ed90d2292978456d2be6f7b9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} + 0ceb21ca2557a61433f097e4d64024e37cae2c10 51ee71efed6170064a7155a9a35e56af0292a203 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} + a2465d1d56d1aee8ed90d2292978456d2be6f7b9 51ee71efed6170064a7155a9a35e56af0292a203 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} + $ hg obslog --all + @ 51ee71efed61 (9) updated e + |\ amended(content) from 0ceb21ca2557 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | | rewritten from a2465d1d56d1 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | | + x | 0ceb21ca2557 (7) updated e + | | rebased(parent) from ff6f7cd76a7c using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | | + | x a2465d1d56d1 (8) updated e + | | rebased(parent) from de4ea3103326 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | | + | x de4ea3103326 (6) updated e + | | rewritten(description, parent, content) from 8d71eadcc9df using prune by test (Thu Jan 01 00:00:00 1970 +0000) + | | + x | ff6f7cd76a7c (5) updated e + |/ rewritten(description, content) from 8d71eadcc9df using amend by test (Thu Jan 01 00:00:00 1970 +0000) + | + x 8d71eadcc9df (4) added e + + $ cd .. Check that canceling of file deletion are merge correctly @@ -340,9 +440,9 @@ with: [3] delete a base: [1] delete a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory is now at 7ca6a9fafcf6 + working directory is now at b1badc7ab394 $ hg glog - @ 4:7ca6a9fafcf6 delete a + @ 4:b1badc7ab394 delete a | () [default] draft o 0:75d2b02c4a5c initial () [default] draft @@ -354,3 +454,22 @@ +++ /dev/null @@ -1,1 +0,0 @@ -a + + $ hg debugobsolete + dff6e52f5e419381c070159c8038ac948f59283f 0825dcee2670349e749f1df45857fca34f61e350 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} + dff6e52f5e419381c070159c8038ac948f59283f 92ecd58f9b05d6c0a1c3833a79359eea4b0268ff 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} + 0825dcee2670349e749f1df45857fca34f61e350 b1badc7ab394c2b9ed21e2961de43c71c2e2288f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} + 92ecd58f9b05d6c0a1c3833a79359eea4b0268ff b1badc7ab394c2b9ed21e2961de43c71c2e2288f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} + $ hg obslog --all + @ b1badc7ab394 (4) delete a + |\ amended(content) from 0825dcee2670 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | | amended(content) from 92ecd58f9b05 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | | + x | 0825dcee2670 (2) delete a + | | amended(content) from dff6e52f5e41 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + | | + | x 92ecd58f9b05 (3) delete a + |/ amended(content) from dff6e52f5e41 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + | + x dff6e52f5e41 (1) delete a +