Show More
@@ -445,8 +445,8 b' and its ancestor by overriding "repo._fi' | |||||
445 | > fparent1 = manifest1.get(fname, node.nullid) |
|
445 | > fparent1 = manifest1.get(fname, node.nullid) | |
446 | > fparent2 = manifest2.get(fname, node.nullid) |
|
446 | > fparent2 = manifest2.get(fname, node.nullid) | |
447 | > meta = {} |
|
447 | > meta = {} | |
448 |
> copy = fctx. |
|
448 | > copy = fctx.copysource() | |
449 |
> if copy and copy |
|
449 | > if copy and copy != fname: | |
450 | > raise error.Abort('copying is not supported') |
|
450 | > raise error.Abort('copying is not supported') | |
451 | > if fparent2 != node.nullid: |
|
451 | > if fparent2 != node.nullid: | |
452 | > changelist.append(fname) |
|
452 | > changelist.append(fname) |
General Comments 0
You need to be logged in to leave comments.
Login now