Show More
@@ -899,8 +899,12 b' class localrepository(repo.repository):' | |||||
899 | new[f] = self._filecommit(fctx, m1, m2, linkrev, trp, |
|
899 | new[f] = self._filecommit(fctx, m1, m2, linkrev, trp, | |
900 | changed) |
|
900 | changed) | |
901 | m1.set(f, fctx.flags()) |
|
901 | m1.set(f, fctx.flags()) | |
902 |
except |
|
902 | except OSError, inst: | |
903 | if error: |
|
903 | self.ui.warn(_("trouble committing %s!\n") % f) | |
|
904 | raise | |||
|
905 | except IOError, inst: | |||
|
906 | errcode = getattr(inst, 'errno', errno.ENOENT) | |||
|
907 | if error or errcode and errcode != errno.ENOENT: | |||
904 | self.ui.warn(_("trouble committing %s!\n") % f) |
|
908 | self.ui.warn(_("trouble committing %s!\n") % f) | |
905 | raise |
|
909 | raise | |
906 | else: |
|
910 | else: |
General Comments 0
You need to be logged in to leave comments.
Login now