Mercurial > evolve
diff tests/test-stack-branch.t @ 4363:a2fdbece7ce1 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 22 Jan 2019 12:57:25 -0500 |
| parents | f9a850018daa d5a2cc19903f |
| children | f54bb6eaf5e6 |
line wrap: on
line diff
--- a/tests/test-stack-branch.t Tue Jan 22 12:55:09 2019 -0500 +++ b/tests/test-stack-branch.t Tue Jan 22 12:57:25 2019 -0500 @@ -109,13 +109,12 @@ $ echo bbb > ddd $ hg commit --amend - 2 new orphan changesets $ hg log -G @ 6 foo {} draft c_d | - | * 5 foo {} draft c_f + | o 5 foo {} draft c_f | | - | * 4 foo {} draft c_e + | o 4 foo {} draft c_e | | | x 3 foo {} draft c_d |/ @@ -226,7 +225,6 @@ 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ echo ccc > ddd $ hg commit --amend -m 'c_D' - 4 new orphan changesets $ hg rebase -d . -s 'desc(c_g)' rebasing 9:2ebb6e48ab8a "c_g" rebasing 10:634f38e27a1d "c_h" @@ -237,9 +235,9 @@ | @ 11 foo {} draft c_D | - | * 8 foo {} draft c_f + | o 8 foo {} draft c_f | | - | * 7 foo {} draft c_e + | o 7 foo {} draft c_e | | | x 6 foo {} draft c_d |/ @@ -271,9 +269,9 @@ | @ 11 foo {} draft c_D | - | * 8 foo {} draft c_f + | o 8 foo {} draft c_f | | - | * 7 foo {} draft c_e + | o 7 foo {} draft c_e | | | x 6 foo {} draft c_d |/