equal
deleted
inserted
replaced
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" |
74 rebasing 1:39e7a938055e "add feature1" (myfeature) |
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) |
118 Rebase the topic |
118 Rebase the topic |
119 $ hg update --rev 5 |
119 $ hg update --rev 5 |
120 switching to topic myotherfeature |
120 switching to topic myotherfeature |
121 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
121 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
122 $ hg rebase |
122 $ hg rebase |
123 rebasing 5:81f854012ec5 "myotherfeature1" |
123 rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature) |
124 merging file |
124 merging file |
125 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
125 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
126 switching to topic myotherfeature |
126 switching to topic myotherfeature |
127 unresolved conflicts (see hg resolve, then hg rebase --continue) |
127 unresolved conflicts (see hg resolve, then hg rebase --continue) |
128 [1] |
128 [1] |
132 $ echo B >> file |
132 $ echo B >> file |
133 $ hg resolve -m |
133 $ hg resolve -m |
134 (no more unresolved files) |
134 (no more unresolved files) |
135 continue: hg rebase --continue |
135 continue: hg rebase --continue |
136 $ hg rebase --continue |
136 $ hg rebase --continue |
137 rebasing 5:81f854012ec5 "myotherfeature1" |
137 rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature) |
138 |
138 |
139 Check the the commit has the right topic |
139 Check the the commit has the right topic |
140 |
140 |
141 $ logtopic |
141 $ logtopic |
142 @ 7:6ccb9ec4913b64f3ad719ff1ba66495a70bf35a4 |
142 @ 7:6ccb9ec4913b64f3ad719ff1ba66495a70bf35a4 |