Show More
@@ -1274,8 +1274,8 b' def _definedestmap(' | |||||
1274 | if revf and srcf: |
|
1274 | if revf and srcf: | |
1275 | raise error.Abort(_(b'cannot specify both a revision and a source')) |
|
1275 | raise error.Abort(_(b'cannot specify both a revision and a source')) | |
1276 |
|
1276 | |||
|
1277 | cmdutil.checkunfinished(repo) | |||
1277 | if not inmemory: |
|
1278 | if not inmemory: | |
1278 | cmdutil.checkunfinished(repo) |
|
|||
1279 | cmdutil.bailifchanged(repo) |
|
1279 | cmdutil.bailifchanged(repo) | |
1280 |
|
1280 | |||
1281 | if ui.configbool(b'commands', b'rebase.requiredest') and not destf: |
|
1281 | if ui.configbool(b'commands', b'rebase.requiredest') and not destf: |
@@ -249,6 +249,10 b' Test reporting of path conflicts' | |||||
249 | rebasing 8:e147e6e3c490 "c/subdir/file.txt" (tip) |
|
249 | rebasing 8:e147e6e3c490 "c/subdir/file.txt" (tip) | |
250 | abort: error: 'c/subdir/file.txt' conflicts with file 'c' in 3. |
|
250 | abort: error: 'c/subdir/file.txt' conflicts with file 'c' in 3. | |
251 | [255] |
|
251 | [255] | |
|
252 | FIXME: shouldn't need this, but when we hit path conflicts in dryrun mode, we | |||
|
253 | don't clean up rebasestate. | |||
|
254 | $ hg rebase --abort | |||
|
255 | rebase aborted | |||
252 | $ hg rebase -r 3 -d . -n |
|
256 | $ hg rebase -r 3 -d . -n | |
253 | starting dry-run rebase; repository will not be changed |
|
257 | starting dry-run rebase; repository will not be changed | |
254 | rebasing 3:844a7de3e617 "c" |
|
258 | rebasing 3:844a7de3e617 "c" | |
@@ -504,9 +508,8 b" Retrying without in-memory merge won't l" | |||||
504 | $ hg resolve -l |
|
508 | $ hg resolve -l | |
505 | U e |
|
509 | U e | |
506 | $ hg rebase -s 2 -d 7 |
|
510 | $ hg rebase -s 2 -d 7 | |
507 | rebasing 2:177f92b77385 "c" |
|
511 | abort: outstanding uncommitted merge | |
508 | abort: outstanding merge conflicts |
|
512 | (use 'hg commit' or 'hg merge --abort') | |
509 | (use 'hg resolve' to resolve) |
|
|||
510 | [255] |
|
513 | [255] | |
511 | $ hg resolve -l |
|
514 | $ hg resolve -l | |
512 | U e |
|
515 | U e | |
@@ -862,3 +865,58 b' Test rebasing when the file we are mergi' | |||||
862 | warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
|
865 | warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') | |
863 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
866 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
864 | [1] |
|
867 | [1] | |
|
868 | ||||
|
869 | $ cd $TESTTMP | |||
|
870 | ||||
|
871 | Test rebasing when we're in the middle of a rebase already | |||
|
872 | $ hg init test_issue6214 | |||
|
873 | $ cd test_issue6214 | |||
|
874 | $ echo r0 > r0 | |||
|
875 | $ hg ci -qAm 'r0' | |||
|
876 | $ echo hi > foo | |||
|
877 | $ hg ci -qAm 'hi from foo' | |||
|
878 | $ hg co -q '.^' | |||
|
879 | $ echo bye > foo | |||
|
880 | $ hg ci -qAm 'bye from foo' | |||
|
881 | $ hg co -q '.^' | |||
|
882 | $ echo unrelated > some_other_file | |||
|
883 | $ hg ci -qAm 'some unrelated changes' | |||
|
884 | $ hg log -G -T'{rev}: {desc}\n{files%"{file}\n"}' | |||
|
885 | @ 3: some unrelated changes | |||
|
886 | | some_other_file | |||
|
887 | | o 2: bye from foo | |||
|
888 | |/ foo | |||
|
889 | | o 1: hi from foo | |||
|
890 | |/ foo | |||
|
891 | o 0: r0 | |||
|
892 | r0 | |||
|
893 | $ hg rebase -r 2 -d 1 -t:merge3 | |||
|
894 | rebasing 2:b4d249fbf8dd "bye from foo" | |||
|
895 | merging foo | |||
|
896 | hit merge conflicts; re-running rebase without in-memory merge | |||
|
897 | rebasing 2:b4d249fbf8dd "bye from foo" | |||
|
898 | merging foo | |||
|
899 | warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') | |||
|
900 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |||
|
901 | [1] | |||
|
902 | $ hg rebase -r 3 -d 1 -t:merge3 | |||
|
903 | abort: rebase in progress | |||
|
904 | (use 'hg rebase --continue' or 'hg rebase --abort') | |||
|
905 | [255] | |||
|
906 | $ hg resolve --list | |||
|
907 | U foo | |||
|
908 | $ hg resolve --all --re-merge -t:other | |||
|
909 | (no more unresolved files) | |||
|
910 | continue: hg rebase --continue | |||
|
911 | $ hg rebase --continue | |||
|
912 | rebasing 2:b4d249fbf8dd "bye from foo" | |||
|
913 | saved backup bundle to $TESTTMP/test_issue6214/.hg/strip-backup/b4d249fbf8dd-299ec25c-rebase.hg | |||
|
914 | $ hg log -G -T'{rev}: {desc}\n{files%"{file}\n"}' | |||
|
915 | o 3: bye from foo | |||
|
916 | | foo | |||
|
917 | | @ 2: some unrelated changes | |||
|
918 | | | some_other_file | |||
|
919 | o | 1: hi from foo | |||
|
920 | |/ foo | |||
|
921 | o 0: r0 | |||
|
922 | r0 |
General Comments 0
You need to be logged in to leave comments.
Login now