Show More
@@ -712,8 +712,8 b' def defineparents(repo, rev, target, sta' | |||||
712 | repo.ui.debug(" future parents are %d and %d\n" % |
|
712 | repo.ui.debug(" future parents are %d and %d\n" % | |
713 | (repo[p1].rev(), repo[p2].rev())) |
|
713 | (repo[p1].rev(), repo[p2].rev())) | |
714 |
|
714 | |||
715 | if rev == min(state): |
|
715 | if not any(p.rev() in state for p in parents): | |
716 |
# Case (1) |
|
716 | # Case (1) root changeset of a non-detaching rebase set. | |
717 | # Let the merge mechanism find the base itself. |
|
717 | # Let the merge mechanism find the base itself. | |
718 | base = None |
|
718 | base = None | |
719 | elif not repo[rev].p2(): |
|
719 | elif not repo[rev].p2(): |
@@ -412,6 +412,16 b' Specify only revs (from 2 onto 8)' | |||||
412 |
|
412 | |||
413 | $ cd .. |
|
413 | $ cd .. | |
414 |
|
414 | |||
|
415 | Rebasing both a single revision and a merge in one command | |||
|
416 | ||||
|
417 | $ hg clone -q -u . a aX | |||
|
418 | $ cd aX | |||
|
419 | $ hg rebase -r 3 -r 6 | |||
|
420 | rebasing 3:32af7686d403 "D" | |||
|
421 | rebasing 6:eea13746799a "G" | |||
|
422 | saved backup bundle to $TESTTMP/aX/.hg/strip-backup/eea13746799a-ad273fd6-backup.hg (glob) | |||
|
423 | $ cd .. | |||
|
424 | ||||
415 | Test --tool parameter: |
|
425 | Test --tool parameter: | |
416 |
|
426 | |||
417 | $ hg init b |
|
427 | $ hg init b |
General Comments 0
You need to be logged in to leave comments.
Login now