Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 39134:e338a921a0cd
rebase: add test for in-memory merge conflicts
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Fri, 17 Aug 2018 10:19:17 +0900 |
parents | 873f3a56993f |
children | 485a3349d5ee |
comparison
equal
deleted
inserted
replaced
39133:06baaf43c959 | 39134:e338a921a0cd |
---|---|
348 rebasing 3:055a42cdd887 "d" | 348 rebasing 3:055a42cdd887 "d" |
349 rebasing 4:e860deea161a "e" | 349 rebasing 4:e860deea161a "e" |
350 merging e | 350 merging e |
351 hit a merge conflict | 351 hit a merge conflict |
352 [1] | 352 [1] |
353 | |
354 In-memory rebase that fails due to merge conflicts | |
355 | |
356 $ hg rebase -s 2 -d 7 | |
357 rebasing 2:177f92b77385 "c" | |
358 rebasing 3:055a42cdd887 "d" | |
359 rebasing 4:e860deea161a "e" | |
360 merging e | |
361 transaction abort! | |
362 rollback completed | |
363 hit merge conflicts; re-running rebase without in-memory merge | |
364 abort: abort and continue do not allow specifying revisions | |
365 [255] | |
353 | 366 |
354 ========================== | 367 ========================== |
355 Test for --confirm option| | 368 Test for --confirm option| |
356 ========================== | 369 ========================== |
357 $ cd .. | 370 $ cd .. |