Show More
@@ -23,9 +23,14 b' from mercurial.lock import release' | |||
|
23 | 23 | from mercurial.i18n import _ |
|
24 | 24 | import os, errno |
|
25 | 25 | |
|
26 | # The following constants are used throughout the rebase module. The ordering of | |
|
27 | # their values must be maintained. | |
|
28 | ||
|
29 | # Indicates that a revision needs to be rebased | |
|
26 | 30 | revtodo = -1 |
|
27 | 31 | nullmerge = -2 |
|
28 | 32 | revignored = -3 |
|
33 | # To do with obsolescence | |
|
29 | 34 | revprecursor = -4 |
|
30 | 35 | |
|
31 | 36 | cmdtable = {} |
@@ -187,6 +192,9 b' def rebase(ui, repo, **opts):' | |||
|
187 | 192 | originalwd = target = None |
|
188 | 193 | activebookmark = None |
|
189 | 194 | external = nullrev |
|
195 | # Mapping between thes old revision id and either what is the new rebased | |
|
196 | # revision or what needs to be done with the old revsion. The state dict | |
|
197 | # will be what contains most of the rebase progress state. | |
|
190 | 198 | state = {} |
|
191 | 199 | skipped = set() |
|
192 | 200 | targetancestors = set() |
General Comments 0
You need to be logged in to leave comments.
Login now