Mercurial > evolve
diff tests/test-topic-rebase.t @ 3016:d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Mon, 25 Sep 2017 02:29:41 +0530 |
| parents | a61634f52742 |
| children | 6604d96fc73c 2b06f144b6e0 |
line wrap: on
line diff
--- a/tests/test-topic-rebase.t Mon Sep 25 02:23:36 2017 +0530 +++ b/tests/test-topic-rebase.t Mon Sep 25 02:29:41 2017 +0530 @@ -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" + rebasing 1:39e7a938055e "add feature1" (myfeature) 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" + rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature) 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" + rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature) Check the the commit has the right topic