equal
deleted
inserted
replaced
1402 fparent2 = manifest2.get(fname, nullid) |
1402 fparent2 = manifest2.get(fname, nullid) |
1403 if isinstance(fctx, context.filectx): |
1403 if isinstance(fctx, context.filectx): |
1404 node = fctx.filenode() |
1404 node = fctx.filenode() |
1405 if node in [fparent1, fparent2]: |
1405 if node in [fparent1, fparent2]: |
1406 self.ui.debug('reusing %s filelog entry\n' % fname) |
1406 self.ui.debug('reusing %s filelog entry\n' % fname) |
|
1407 if manifest1.flags(fname) != fctx.flags(): |
|
1408 changelist.append(fname) |
1407 return node |
1409 return node |
1408 |
1410 |
1409 flog = self.file(fname) |
1411 flog = self.file(fname) |
1410 meta = {} |
1412 meta = {} |
1411 copy = fctx.renamed() |
1413 copy = fctx.renamed() |