Mercurial > evolve
diff tests/test-evolve-content-divergent-stack.t @ 5301:e8660b28bfee
obslog: makes --origin flag the default
Test change have been carefully validated.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Thu, 07 May 2020 01:29:48 +0200 |
parents | a73cdef2e33f |
children | 011b53a9d03c a8c21707e9c4 |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-stack.t Thu May 07 01:29:24 2020 +0200 +++ b/tests/test-evolve-content-divergent-stack.t Thu May 07 01:29:48 2020 +0200 @@ -664,34 +664,34 @@ $ hg obslog -r 'desc("watbar to a")' --all o ebb749d2ace8 (21) watbar to a - |\ + |\ rewritten from 186bdc2cdfa2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | | rewritten(description, content) from c04ff147ef79 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | | x | 186bdc2cdfa2 (20) watbar to a - | | rewritten as ebb749d2ace8 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | | rebased(parent) from 8e222f257bbf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) | | | x c04ff147ef79 (10) added a - | | rewritten(description, content) as ebb749d2ace8 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | | rebased(parent) from c7586e2a9264 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) | | x | 8e222f257bbf (5) watbar to a - |/ rebased(parent) as 186bdc2cdfa2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + |/ rewritten(description, content) from c7586e2a9264 using amend by test (Thu Jan 01 00:00:00 1970 +0000) | x c7586e2a9264 (1) added a - rewritten(description, content) as 8e222f257bbf using amend by test (Thu Jan 01 00:00:00 1970 +0000) - rebased(parent) as c04ff147ef79 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) $ hg obslog -r 'desc("added b")' --all @ 2a955e808c53 (14) added b + | amended(content) from 6eb54b5af3fb using amend by test (Thu Jan 01 00:00:00 1970 +0000) | | * 509103439e5e (17) added b + | | amended(content) from d5f148423c16 using amend by test (Thu Jan 01 00:00:00 1970 +0000) | | x | 6eb54b5af3fb (11) added b - | | amended(content) as 2a955e808c53 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + | | rebased(parent) from b1661037fa25 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) | | | x d5f148423c16 (6) added b - |/ amended(content) as 509103439e5e using amend by test (Thu Jan 01 00:00:00 1970 +0000) + |/ rebased(parent) from b1661037fa25 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) | x b1661037fa25 (2) added b - rebased(parent) as 6eb54b5af3fb using rebase by test (Thu Jan 01 00:00:00 1970 +0000) - rebased(parent) as d5f148423c16 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) Again, let's evolve the stack