equal
deleted
inserted
replaced
1104 |
1104 |
1105 m1, m2, ma = wctx.manifest(), p2.manifest(), pa.manifest() |
1105 m1, m2, ma = wctx.manifest(), p2.manifest(), pa.manifest() |
1106 copied = set(copy.values()) |
1106 copied = set(copy.values()) |
1107 copied.update(movewithdir.values()) |
1107 copied.update(movewithdir.values()) |
1108 |
1108 |
1109 if '.hgsubstate' in m1: |
1109 if '.hgsubstate' in m1 and wctx.rev() is None: |
1110 # check whether sub state is modified |
1110 # Check whether sub state is modified, and overwrite the manifest |
|
1111 # to flag the change. If wctx is a committed revision, we shouldn't |
|
1112 # care for the dirty state of the working directory. |
1111 if any(wctx.sub(s).dirty() for s in wctx.substate): |
1113 if any(wctx.sub(s).dirty() for s in wctx.substate): |
1112 m1['.hgsubstate'] = modifiednodeid |
1114 m1['.hgsubstate'] = modifiednodeid |
1113 |
1115 |
1114 # Don't use m2-vs-ma optimization if: |
1116 # Don't use m2-vs-ma optimization if: |
1115 # - ma is the same as m1 or m2, which we're just going to diff again later |
1117 # - ma is the same as m1 or m2, which we're just going to diff again later |