equal
deleted
inserted
replaced
321 $ cat a |
321 $ cat a |
322 new |
322 new |
323 |
323 |
324 $ cd .. |
324 $ cd .. |
325 |
325 |
|
326 test aborting an interrupted series (issue5084) |
|
327 $ hg init interrupted |
|
328 $ cd interrupted |
|
329 $ touch base |
|
330 $ hg add base |
|
331 $ hg commit -m base |
|
332 $ touch a |
|
333 $ hg add a |
|
334 $ hg commit -m a |
|
335 $ echo 1 > a |
|
336 $ hg commit -m 1 |
|
337 $ touch b |
|
338 $ hg add b |
|
339 $ hg commit -m b |
|
340 $ echo 2 >> a |
|
341 $ hg commit -m c |
|
342 $ touch d |
|
343 $ hg add d |
|
344 $ hg commit -m d |
|
345 $ hg co -q 1 |
|
346 $ hg rm a |
|
347 $ hg commit -m no-a |
|
348 created new head |
|
349 $ hg co 0 |
|
350 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
351 $ hg log -G --template "{rev} {desc} {bookmarks}" |
|
352 o 6 no-a |
|
353 | |
|
354 | o 5 d |
|
355 | | |
|
356 | o 4 c |
|
357 | | |
|
358 | o 3 b |
|
359 | | |
|
360 | o 2 1 |
|
361 |/ |
|
362 o 1 a |
|
363 | |
|
364 @ 0 base |
|
365 |
|
366 $ hg --config extensions.n=$TESTDIR/failfilemerge.py rebase -s 3 -d tip |
|
367 rebasing 3:3a71550954f1 "b" |
|
368 rebasing 4:e80b69427d80 "c" |
|
369 abort: ^C |
|
370 [255] |
|
371 $ hg rebase --abort |
|
372 saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg (glob) |
|
373 rebase aborted |
|
374 $ hg log -G --template "{rev} {desc} {bookmarks}" |
|
375 o 6 no-a |
|
376 | |
|
377 | o 5 d |
|
378 | | |
|
379 | o 4 c |
|
380 | | |
|
381 | o 3 b |
|
382 | | |
|
383 | o 2 1 |
|
384 |/ |
|
385 o 1 a |
|
386 | |
|
387 @ 0 base |
|
388 |
|
389 $ hg summary |
|
390 parent: 0:df4f53cec30a |
|
391 base |
|
392 branch: default |
|
393 commit: (clean) |
|
394 update: 6 new changesets (update) |
|
395 phases: 7 draft |
|
396 |
|
397 $ cd .. |
326 On the other hand, make sure we *do* clobber changes whenever we |
398 On the other hand, make sure we *do* clobber changes whenever we |
327 haven't somehow managed to update the repo to a different revision |
399 haven't somehow managed to update the repo to a different revision |
328 during a rebase (issue4661) |
400 during a rebase (issue4661) |
329 |
401 |
330 $ hg ini yesupdate |
402 $ hg ini yesupdate |