Show More
@@ -150,7 +150,7 b' class patchheader(object):' | |||||
150 | elif line.startswith("# Date "): |
|
150 | elif line.startswith("# Date "): | |
151 | date = line[7:] |
|
151 | date = line[7:] | |
152 | elif line.startswith("# Parent "): |
|
152 | elif line.startswith("# Parent "): | |
153 | parent = line[9:].lstrip() |
|
153 | parent = line[9:].lstrip() # handle double trailing space | |
154 | elif line.startswith("# Branch "): |
|
154 | elif line.startswith("# Branch "): | |
155 | branch = line[9:] |
|
155 | branch = line[9:] | |
156 | elif line.startswith("# Node ID "): |
|
156 | elif line.startswith("# Node ID "): | |
@@ -232,7 +232,8 b' class patchheader(object):' | |||||
232 | self.date = date |
|
232 | self.date = date | |
233 |
|
233 | |||
234 | def setparent(self, parent): |
|
234 | def setparent(self, parent): | |
235 |
if not self.updateheader(['# Parent '], parent) |
|
235 | if not (self.updateheader(['# Parent '], parent) or | |
|
236 | self.updateheader(['# Parent '], parent)): | |||
236 | try: |
|
237 | try: | |
237 | patchheaderat = self.comments.index('# HG changeset patch') |
|
238 | patchheaderat = self.comments.index('# HG changeset patch') | |
238 | self.comments.insert(patchheaderat + 1, '# Parent ' + parent) |
|
239 | self.comments.insert(patchheaderat + 1, '# Parent ' + parent) |
General Comments 0
You need to be logged in to leave comments.
Login now