Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 38426:00368bc0a614
merge with stable
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 21 Jun 2018 09:32:31 -0700 |
| parents | ef692614e601 1322ae04d3d7 |
| children | d4be8ea8f22d |
comparison
equal
deleted
inserted
replaced
| 38424:4f885770c4a2 | 38426:00368bc0a614 |
|---|---|
| 1148 | 1148 |
| 1149 m1, m2, ma = wctx.manifest(), p2.manifest(), pa.manifest() | 1149 m1, m2, ma = wctx.manifest(), p2.manifest(), pa.manifest() |
| 1150 copied = set(copy.values()) | 1150 copied = set(copy.values()) |
| 1151 copied.update(movewithdir.values()) | 1151 copied.update(movewithdir.values()) |
| 1152 | 1152 |
| 1153 if '.hgsubstate' in m1: | 1153 if '.hgsubstate' in m1 and wctx.rev() is None: |
| 1154 # check whether sub state is modified | 1154 # Check whether sub state is modified, and overwrite the manifest |
| 1155 # to flag the change. If wctx is a committed revision, we shouldn't | |
| 1156 # care for the dirty state of the working directory. | |
| 1155 if any(wctx.sub(s).dirty() for s in wctx.substate): | 1157 if any(wctx.sub(s).dirty() for s in wctx.substate): |
| 1156 m1['.hgsubstate'] = modifiednodeid | 1158 m1['.hgsubstate'] = modifiednodeid |
| 1157 | 1159 |
| 1158 # Don't use m2-vs-ma optimization if: | 1160 # Don't use m2-vs-ma optimization if: |
| 1159 # - ma is the same as m1 or m2, which we're just going to diff again later | 1161 # - ma is the same as m1 or m2, which we're just going to diff again later |