Show More
@@ -1457,14 +1457,8 b' class localrepository(object):' | |||||
1457 | del mf[fn] |
|
1457 | del mf[fn] | |
1458 | return mf |
|
1458 | return mf | |
1459 |
|
1459 | |||
1460 | if isinstance(node1, context.changectx): |
|
1460 | ctx1 = self[node1] | |
1461 |
|
|
1461 | ctx2 = self[node2] | |
1462 | else: |
|
|||
1463 | ctx1 = self[node1] |
|
|||
1464 | if isinstance(node2, context.changectx): |
|
|||
1465 | ctx2 = node2 |
|
|||
1466 | else: |
|
|||
1467 | ctx2 = self[node2] |
|
|||
1468 |
|
1462 | |||
1469 | working = ctx2.rev() is None |
|
1463 | working = ctx2.rev() is None | |
1470 | parentworking = working and ctx1 == self['.'] |
|
1464 | parentworking = working and ctx1 == self['.'] |
General Comments 0
You need to be logged in to leave comments.
Login now