Show More
@@ -117,8 +117,10 b' class transplanter(object):' | |||||
117 | return True |
|
117 | return True | |
118 | return False |
|
118 | return False | |
119 |
|
119 | |||
120 |
def apply(self, repo, source, revmap, merges, opts= |
|
120 | def apply(self, repo, source, revmap, merges, opts=None): | |
121 | '''apply the revisions in revmap one by one in revision order''' |
|
121 | '''apply the revisions in revmap one by one in revision order''' | |
|
122 | if opts is None: | |||
|
123 | opts = {} | |||
122 | revs = sorted(revmap) |
|
124 | revs = sorted(revmap) | |
123 | p1, p2 = repo.dirstate.parents() |
|
125 | p1, p2 = repo.dirstate.parents() | |
124 | pulls = [] |
|
126 | pulls = [] |
General Comments 0
You need to be logged in to leave comments.
Login now