equal
deleted
inserted
replaced
1405 removed.append(f) |
1405 removed.append(f) |
1406 else: |
1406 else: |
1407 added.append(f) |
1407 added.append(f) |
1408 m[f] = self._filecommit(fctx, m1, m2, linkrev, |
1408 m[f] = self._filecommit(fctx, m1, m2, linkrev, |
1409 trp, changed) |
1409 trp, changed) |
1410 m.set(f, fctx.flags()) |
1410 m.setflag(f, fctx.flags()) |
1411 except OSError, inst: |
1411 except OSError, inst: |
1412 self.ui.warn(_("trouble committing %s!\n") % f) |
1412 self.ui.warn(_("trouble committing %s!\n") % f) |
1413 raise |
1413 raise |
1414 except IOError, inst: |
1414 except IOError, inst: |
1415 errcode = getattr(inst, 'errno', errno.ENOENT) |
1415 errcode = getattr(inst, 'errno', errno.ENOENT) |