Show More
@@ -876,8 +876,12 b' class localrepository(repo.repository):' | |||||
876 | new[f] = self._filecommit(fctx, m1, m2, linkrev, trp, |
|
876 | new[f] = self._filecommit(fctx, m1, m2, linkrev, trp, | |
877 | changed) |
|
877 | changed) | |
878 | m1.set(f, fctx.flags()) |
|
878 | m1.set(f, fctx.flags()) | |
879 |
except |
|
879 | except OSError, inst: | |
880 | if error: |
|
880 | self.ui.warn(_("trouble committing %s!\n") % f) | |
|
881 | raise | |||
|
882 | except IOError, inst: | |||
|
883 | errcode = getattr(inst, 'errno', errno.ENOENT) | |||
|
884 | if error or errcode and errcode != errno.ENOENT: | |||
881 | self.ui.warn(_("trouble committing %s!\n") % f) |
|
885 | self.ui.warn(_("trouble committing %s!\n") % f) | |
882 | raise |
|
886 | raise | |
883 | else: |
|
887 | else: |
General Comments 0
You need to be logged in to leave comments.
Login now