Show More
@@ -241,3 +241,50 b' rebase abort should not leave working co' | |||||
241 | o 0 a |
|
241 | o 0 a | |
242 |
|
242 | |||
243 | $ cd .. |
|
243 | $ cd .. | |
|
244 | ||||
|
245 | Make sure we don't clobber changes in the working directory when the | |||
|
246 | user has somehow managed to update to a different revision (issue4009) | |||
|
247 | ||||
|
248 | $ hg init noupdate | |||
|
249 | $ cd noupdate | |||
|
250 | $ hg book @ | |||
|
251 | $ echo original > a | |||
|
252 | $ hg add a | |||
|
253 | $ hg commit -m a | |||
|
254 | $ echo x > b | |||
|
255 | $ hg add b | |||
|
256 | $ hg commit -m b1 | |||
|
257 | $ hg up 0 | |||
|
258 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
259 | (leaving bookmark @) | |||
|
260 | $ hg book foo | |||
|
261 | $ echo y > b | |||
|
262 | $ hg add b | |||
|
263 | $ hg commit -m b2 | |||
|
264 | created new head | |||
|
265 | ||||
|
266 | $ hg rebase -d @ -b foo --tool=internal:fail | |||
|
267 | rebasing 2:070cf4580bb5 "b2" (tip foo) | |||
|
268 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |||
|
269 | [1] | |||
|
270 | ||||
|
271 | $ mv .hg/rebasestate ./ # so we're allowed to hg up like in mercurial <2.6.3 | |||
|
272 | $ hg up -C 0 # user does other stuff in the repo | |||
|
273 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
274 | ||||
|
275 | $ mv rebasestate .hg/ # user upgrades to 2.7 | |||
|
276 | ||||
|
277 | $ echo new > a | |||
|
278 | $ hg up 1 # user gets an error saying to run hg rebase --abort | |||
|
279 | abort: rebase in progress | |||
|
280 | (use 'hg rebase --continue' or 'hg rebase --abort') | |||
|
281 | [255] | |||
|
282 | ||||
|
283 | $ cat a | |||
|
284 | new | |||
|
285 | $ hg rebase --abort | |||
|
286 | rebase aborted | |||
|
287 | $ cat a | |||
|
288 | new | |||
|
289 | ||||
|
290 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now