equal
deleted
inserted
replaced
6127 except OSError as inst: |
6127 except OSError as inst: |
6128 if inst.errno != errno.ENOENT: |
6128 if inst.errno != errno.ENOENT: |
6129 raise |
6129 raise |
6130 |
6130 |
6131 ms.commit() |
6131 ms.commit() |
6132 ms.recordactions() |
6132 branchmerge = repo.dirstate.p2() != nullid |
|
6133 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None) |
6133 |
6134 |
6134 if not didwork and pats: |
6135 if not didwork and pats: |
6135 hint = None |
6136 hint = None |
6136 if not any([p for p in pats if p.find(b':') >= 0]): |
6137 if not any([p for p in pats if p.find(b':') >= 0]): |
6137 pats = [b'path:%s' % p for p in pats] |
6138 pats = [b'path:%s' % p for p in pats] |