Mercurial > evolve
diff tests/test-topic-rebase.t @ 4082:185770c10a4e mercurial-4.3
test-compat: merge mercurial-4.4 into mercurial-4.3
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 03 Sep 2018 22:59:20 +0200 |
| parents | 9c025ec4af88 |
| children |
line wrap: on
line diff
--- a/tests/test-topic-rebase.t Mon Sep 03 22:59:19 2018 +0200 +++ b/tests/test-topic-rebase.t Mon Sep 03 22:59:20 2018 +0200 @@ -72,7 +72,7 @@ switching to topic myfeature 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg rebase - rebasing 1:39e7a938055e "add feature1" (myfeature) + rebasing 1:39e7a938055e "add feature1" switching to topic myfeature $ hg stack ### topic: myfeature @@ -123,7 +123,7 @@ switching to topic myotherfeature 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg rebase - rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature) + rebasing 5:81f854012ec5 "myotherfeature1" merging file warning: conflicts while merging file! (edit, then use 'hg resolve --mark') switching to topic myotherfeature @@ -137,7 +137,7 @@ (no more unresolved files) continue: hg rebase --continue $ hg rebase --continue - rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature) + rebasing 5:81f854012ec5 "myotherfeature1" Check the the commit has the right topic