Mercurial > evolve
diff tests/test-topic-stack.t @ 3592:7a5c3175015e mercurial-4.2
test-compat: merge mercurial-4.3 into mercurial-4.2
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 21 Mar 2018 16:32:54 +0100 |
parents | 98941c28f3e2 1e2f683e11e7 |
children | b92114f201c9 |
line wrap: on
line diff
--- a/tests/test-topic-stack.t Wed Mar 21 16:18:31 2018 +0100 +++ b/tests/test-topic-stack.t Wed Mar 21 16:32:54 2018 +0100 @@ -832,7 +832,7 @@ t2@ c_G (current) t1: c_D t0^ c_A (base) - $ hg --config extensions.evolve= --config ui.interactive=yes split << EOF + $ hg --config extensions.evolve= --config ui.interactive=yes split --date '0 0' << EOF > y > y > n @@ -861,16 +861,16 @@ | @ e7ea874afbd5 (23) c_G |/ x b24bab30ac12 (21) c_G - | rewritten as dde94df880e9, e7ea874afbd5 by test (Thu Jan 01 00:00:00 1970 +0000) + | rewritten(parent, content) as dde94df880e9, e7ea874afbd5 by test (*) (glob) | x 907f7d3c2333 (18) c_G - | rewritten as b24bab30ac12 by test (Thu Jan 01 00:00:00 1970 +0000) + | rewritten as b24bab30ac12 by test (*) (glob) | x 3ab2eedae500 (13) c_G - | rewritten as 907f7d3c2333 by test (Thu Jan 01 00:00:00 1970 +0000) + | rewritten as 907f7d3c2333 by test (*) (glob) | x c7d60a180d05 (6) c_G - rewritten as 3ab2eedae500 by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten as 3ab2eedae500 by test (*) (glob) $ hg export . # HG changeset patch