Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
authorPatrick Mezard <pmezard@gmail.com>
Sat, 13 Feb 2010 02:06:13 +0100
changeset 10429 1c50a954a524
parent 10427 400ffd5f2f14 (current diff)
parent 10428 e553a425751d (diff)
child 10430 5cef810e588f
Merge with crew-stable
mercurial/localrepo.py file | annotate | diff | comparison | revisions 
--- a/mercurial/localrepo.py	Fri Feb 12 21:30:24 2010 +0100
+++ b/mercurial/localrepo.py	Sat Feb 13 02:06:13 2010 +0100
@@ -899,8 +899,12 @@
                     new[f] = self._filecommit(fctx, m1, m2, linkrev, trp,
                                               changed)
                     m1.set(f, fctx.flags())
-                except (OSError, IOError):
-                    if error:
+                except OSError, inst:
+                    self.ui.warn(_("trouble committing %s!\n") % f)
+                    raise
+                except IOError, inst:
+                    errcode = getattr(inst, 'errno', errno.ENOENT)
+                    if error or errcode and errcode != errno.ENOENT:
                         self.ui.warn(_("trouble committing %s!\n") % f)
                         raise
                     else:
mercurial