Show More
@@ -271,15 +271,11 b' def extract(ui, fileobj):' | |||||
271 | data['branch'] = branch |
|
271 | data['branch'] = branch | |
272 | return data |
|
272 | return data | |
273 |
|
273 | |||
|
274 | p1 = p2 = None | |||
274 | if parents: |
|
275 | if parents: | |
275 | p1 = parents.pop(0) |
|
276 | p1 = parents.pop(0) | |
276 | else: |
|
277 | if parents: | |
277 | p1 = None |
|
278 | p2 = parents.pop(0) | |
278 |
|
||||
279 | if parents: |
|
|||
280 | p2 = parents.pop(0) |
|
|||
281 | else: |
|
|||
282 | p2 = None |
|
|||
283 |
|
279 | |||
284 | data['filename'] = tmpname |
|
280 | data['filename'] = tmpname | |
285 | data['message'] = message |
|
281 | data['message'] = message |
General Comments 0
You need to be logged in to leave comments.
Login now