Mercurial > evolve
comparison tests/test-topic-rebase.t @ 3440:42b3ac0a5b05 mercurial-4.3
test-compat: merge stable into mercurial-4.3
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 20 Jan 2018 12:38:09 +0100 |
| parents | 85cdce113c2c |
| children | 537fd9a86c06 |
comparison
equal
deleted
inserted
replaced
| 3439:6c772398eb4e | 3440:42b3ac0a5b05 |
|---|---|
| 69 Rebase the commit | 69 Rebase the commit |
| 70 $ hg update --rev 1 | 70 $ hg update --rev 1 |
| 71 switching to topic myfeature | 71 switching to topic myfeature |
| 72 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 72 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 73 $ hg rebase | 73 $ hg rebase |
| 74 rebasing 1:39e7a938055e "add feature1" (myfeature) | 74 rebasing 1:39e7a938055e "add feature1" |
| 75 switching to topic myfeature | 75 switching to topic myfeature |
| 76 $ hg stack | 76 $ hg stack |
| 77 ### topic: myfeature | 77 ### topic: myfeature |
| 78 ### target: default (branch) | 78 ### target: default (branch) |
| 79 t1@ add feature1 (current) | 79 t1@ add feature1 (current) |
| 119 Rebase the topic | 119 Rebase the topic |
| 120 $ hg update --rev 5 | 120 $ hg update --rev 5 |
| 121 switching to topic myotherfeature | 121 switching to topic myotherfeature |
| 122 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 122 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 123 $ hg rebase | 123 $ hg rebase |
| 124 rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature) | 124 rebasing 5:81f854012ec5 "myotherfeature1" |
| 125 merging file | 125 merging file |
| 126 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') | 126 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
| 127 switching to topic myotherfeature | 127 switching to topic myotherfeature |
| 128 unresolved conflicts (see hg resolve, then hg rebase --continue) | 128 unresolved conflicts (see hg resolve, then hg rebase --continue) |
| 129 [1] | 129 [1] |
| 133 $ echo B >> file | 133 $ echo B >> file |
| 134 $ hg resolve -m | 134 $ hg resolve -m |
| 135 (no more unresolved files) | 135 (no more unresolved files) |
| 136 continue: hg rebase --continue | 136 continue: hg rebase --continue |
| 137 $ hg rebase --continue | 137 $ hg rebase --continue |
| 138 rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature) | 138 rebasing 5:81f854012ec5 "myotherfeature1" |
| 139 | 139 |
| 140 Check the the commit has the right topic | 140 Check the the commit has the right topic |
| 141 | 141 |
| 142 $ logtopic | 142 $ logtopic |
| 143 @ 7:6ccb9ec4913b64f3ad719ff1ba66495a70bf35a4 | 143 @ 7:6ccb9ec4913b64f3ad719ff1ba66495a70bf35a4 |