Mercurial > evolve
diff tests/test-evolve-issue5832.t @ 4516:f54bb6eaf5e6 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 11 Apr 2019 22:44:53 +0200 |
| parents | a2fdbece7ce1 159a4a6ded0b |
| children | 79bc0f1a832e |
line wrap: on
line diff
--- a/tests/test-evolve-issue5832.t Thu Apr 11 22:42:14 2019 +0200 +++ b/tests/test-evolve-issue5832.t Thu Apr 11 22:44:53 2019 +0200 @@ -52,7 +52,6 @@ 0 files updated, 0 files merged, 3 files removed, 0 files unresolved $ echo foo > a $ hg amend - 2 new orphan changesets $ hg up bde1d2b6b5e5 0 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -69,11 +68,11 @@ |/ () draft | o 5:7014ec2829cd added a |/ () draft - | * 4:b9b387427a53 merge commit + | o 4:b9b387427a53 merge commit | |\ () draft +---o 3:9402371b436e added c and d | | () draft - | * 2:a1da0651488c added b + | o 2:a1da0651488c added b | | () draft | x 1:1b24879c5c3c added a |/ () draft @@ -90,11 +89,11 @@ |/ () draft | o 5:7014ec2829cd added a |/ () draft - | * 4:b9b387427a53 merge commit + | o 4:b9b387427a53 merge commit | |\ () draft +---x 3:9402371b436e added c and d | | () draft - | * 2:a1da0651488c added b + | o 2:a1da0651488c added b | | () draft | x 1:1b24879c5c3c added a |/ () draft @@ -192,7 +191,6 @@ $ hg ci -Aqm "added l" $ hg pick -r 1b24879c5c3c picking 1:1b24879c5c3c "added a" - 2 new orphan changesets $ hg up bde1d2b6b5e5 0 files updated, 0 files merged, 2 files removed, 0 files unresolved @@ -212,11 +210,11 @@ | | () draft | o 5:0a6281e212fe added l |/ () draft - | * 4:b9b387427a53 merge commit + | o 4:b9b387427a53 merge commit | |\ () draft +---o 3:9402371b436e added c and d | | () draft - | * 2:a1da0651488c added b + | o 2:a1da0651488c added b | | () draft | x 1:1b24879c5c3c added a |/ () draft @@ -235,11 +233,11 @@ | | () draft | o 5:0a6281e212fe added l |/ () draft - | * 4:b9b387427a53 merge commit + | o 4:b9b387427a53 merge commit | |\ () draft +---x 3:9402371b436e added c and d | | () draft - | * 2:a1da0651488c added b + | o 2:a1da0651488c added b | | () draft | x 1:1b24879c5c3c added a |/ () draft @@ -337,7 +335,6 @@ $ hg ci -Aqm "added l" $ hg pick -r 1b24879c5c3c picking 1:1b24879c5c3c "added a" - 2 new orphan changesets $ hg up bde1d2b6b5e5 0 files updated, 0 files merged, 2 files removed, 0 files unresolved @@ -357,11 +354,11 @@ | | () draft | o 5:0a6281e212fe added l |/ () draft - | * 4:b9b387427a53 merge commit + | o 4:b9b387427a53 merge commit | |\ () draft +---o 3:9402371b436e added c and d | | () draft - | * 2:a1da0651488c added b + | o 2:a1da0651488c added b | | () draft | x 1:1b24879c5c3c added a |/ () draft @@ -380,11 +377,11 @@ | | () draft | o 5:0a6281e212fe added l |/ () draft - | * 4:b9b387427a53 merge commit + | o 4:b9b387427a53 merge commit | |\ () draft +---x 3:9402371b436e added c and d | | () draft - | * 2:a1da0651488c added b + | o 2:a1da0651488c added b | | () draft | x 1:1b24879c5c3c added a |/ () draft