Mercurial > evolve
diff tests/test-topic-rebase.t @ 3102:6604d96fc73c mercurial-4.3
test-compat: revert output change in rebase
This backed out changeset d12c82fd1143 and a couple of other changes.
The change are not relevant in Mercurial < 4.4/
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 20 Oct 2017 17:30:20 +0200 |
| parents | d12c82fd1143 |
| children | 85cdce113c2c |
line wrap: on
line diff
--- a/tests/test-topic-rebase.t Fri Oct 20 15:31:06 2017 +0200 +++ b/tests/test-topic-rebase.t Fri Oct 20 17:30:20 2017 +0200 @@ -71,7 +71,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 @@ -120,7 +120,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 @@ -134,7 +134,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