Show More
@@ -1198,7 +1198,7 b' def buildstate(repo, dest, rebaseset, co' | |||
|
1198 | 1198 | repo.ui.debug('source is a child of destination\n') |
|
1199 | 1199 | return None |
|
1200 | 1200 | |
|
1201 |
repo.ui.debug('rebase onto % |
|
|
1201 | repo.ui.debug('rebase onto %s starting from %s\n' % (dest, root)) | |
|
1202 | 1202 | state.update(dict.fromkeys(rebaseset, revtodo)) |
|
1203 | 1203 | # Rebase tries to turn <dest> into a parent of <root> while |
|
1204 | 1204 | # preserving the number of parents of rebased changesets: |
@@ -219,7 +219,7 b' Check that the right ancestors is used w' | |||
|
219 | 219 | summary: added default.txt |
|
220 | 220 | |
|
221 | 221 | $ hg rebase -s9 -d2 --debug # use debug to really check merge base used |
|
222 |
rebase onto |
|
|
222 | rebase onto 4bc80088dc6b starting from e31216eec445 | |
|
223 | 223 | ignoring null merge rebase of 3 |
|
224 | 224 | ignoring null merge rebase of 4 |
|
225 | 225 | ignoring null merge rebase of 6 |
General Comments 0
You need to be logged in to leave comments.
Login now