equal
deleted
inserted
replaced
6262 # - we are sure we store that information well enough to be able to reuse it |
6262 # - we are sure we store that information well enough to be able to reuse it |
6263 # - we are the necessary logic to reuse it right. |
6263 # - we are the necessary logic to reuse it right. |
6264 # |
6264 # |
6265 # All this should eventually happens, but in the mean time, we use this |
6265 # All this should eventually happens, but in the mean time, we use this |
6266 # context manager slightly out of the context it should be. |
6266 # context manager slightly out of the context it should be. |
6267 with repo.dirstate.parentchange(repo): |
6267 with repo.dirstate.changing_parents(repo): |
6268 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None) |
6268 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None) |
6269 |
6269 |
6270 if not didwork and pats: |
6270 if not didwork and pats: |
6271 hint = None |
6271 hint = None |
6272 if not any([p for p in pats if p.find(b':') >= 0]): |
6272 if not any([p for p in pats if p.find(b':') >= 0]): |