Mercurial > evolve
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 4081:20dcc92c285f | 4082:185770c10a4e |
|---|---|
| 70 Rebase the commit | 70 Rebase the commit |
| 71 $ hg update --rev 1 | 71 $ hg update --rev 1 |
| 72 switching to topic myfeature | 72 switching to topic myfeature |
| 73 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 73 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 74 $ hg rebase | 74 $ hg rebase |
| 75 rebasing 1:39e7a938055e "add feature1" (myfeature) | 75 rebasing 1:39e7a938055e "add feature1" |
| 76 switching to topic myfeature | 76 switching to topic myfeature |
| 77 $ hg stack | 77 $ hg stack |
| 78 ### topic: myfeature | 78 ### topic: myfeature |
| 79 ### target: default (branch) | 79 ### target: default (branch) |
| 80 s1@ add feature1 (current) | 80 s1@ add feature1 (current) |
| 121 Rebase the topic | 121 Rebase the topic |
| 122 $ hg update --rev 5 | 122 $ hg update --rev 5 |
| 123 switching to topic myotherfeature | 123 switching to topic myotherfeature |
| 124 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 124 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 125 $ hg rebase | 125 $ hg rebase |
| 126 rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature) | 126 rebasing 5:81f854012ec5 "myotherfeature1" |
| 127 merging file | 127 merging file |
| 128 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') | 128 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
| 129 switching to topic myotherfeature | 129 switching to topic myotherfeature |
| 130 unresolved conflicts (see hg resolve, then hg rebase --continue) | 130 unresolved conflicts (see hg resolve, then hg rebase --continue) |
| 131 [1] | 131 [1] |
| 135 $ echo B >> file | 135 $ echo B >> file |
| 136 $ hg resolve -m | 136 $ hg resolve -m |
| 137 (no more unresolved files) | 137 (no more unresolved files) |
| 138 continue: hg rebase --continue | 138 continue: hg rebase --continue |
| 139 $ hg rebase --continue | 139 $ hg rebase --continue |
| 140 rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature) | 140 rebasing 5:81f854012ec5 "myotherfeature1" |
| 141 | 141 |
| 142 Check the the commit has the right topic | 142 Check the the commit has the right topic |
| 143 | 143 |
| 144 $ logtopic | 144 $ logtopic |
| 145 @ 7:6ccb9ec4913b64f3ad719ff1ba66495a70bf35a4 | 145 @ 7:6ccb9ec4913b64f3ad719ff1ba66495a70bf35a4 |