Show More
@@ -1246,7 +1246,7 b' def buildstate(repo, dest, rebaseset, co' | |||
|
1246 | 1246 | if not roots: |
|
1247 | 1247 | raise error.Abort(_('no matching revisions')) |
|
1248 | 1248 | roots.sort() |
|
1249 | state = {} | |
|
1249 | state = dict.fromkeys(rebaseset, revtodo) | |
|
1250 | 1250 | detachset = set() |
|
1251 | 1251 | for root in roots: |
|
1252 | 1252 | commonbase = root.ancestor(dest) |
@@ -1264,7 +1264,6 b' def buildstate(repo, dest, rebaseset, co' | |||
|
1264 | 1264 | return None |
|
1265 | 1265 | |
|
1266 | 1266 | repo.ui.debug('rebase onto %s starting from %s\n' % (dest, root)) |
|
1267 | state.update(dict.fromkeys(rebaseset, revtodo)) | |
|
1268 | 1267 | # Rebase tries to turn <dest> into a parent of <root> while |
|
1269 | 1268 | # preserving the number of parents of rebased changesets: |
|
1270 | 1269 | # |
General Comments 0
You need to be logged in to leave comments.
Login now