Show More
@@ -1696,7 +1696,11 b' class localrepository(object):' | |||||
1696 | tr = self.transaction("commit") |
|
1696 | tr = self.transaction("commit") | |
1697 | trp = weakref.proxy(tr) |
|
1697 | trp = weakref.proxy(tr) | |
1698 |
|
1698 | |||
1699 |
if ctx. |
|
1699 | if ctx.manifestnode(): | |
|
1700 | # reuse an existing manifest revision | |||
|
1701 | mn = ctx.manifestnode() | |||
|
1702 | files = ctx.files() | |||
|
1703 | elif ctx.files(): | |||
1700 | m1ctx = p1.manifestctx() |
|
1704 | m1ctx = p1.manifestctx() | |
1701 | m2ctx = p2.manifestctx() |
|
1705 | m2ctx = p2.manifestctx() | |
1702 | mctx = m1ctx.copy() |
|
1706 | mctx = m1ctx.copy() |
General Comments 0
You need to be logged in to leave comments.
Login now