--- a/hgext/inotify/linuxserver.py Tue Apr 03 22:02:04 2012 +0200
+++ b/hgext/inotify/linuxserver.py Wed Apr 04 11:19:09 2012 +0200
@@ -7,7 +7,7 @@
# GNU General Public License version 2 or any later version.
from mercurial.i18n import _
-from mercurial import osutil, util
+from mercurial import osutil, util, error
import server
import errno, os, select, stat, sys, time
@@ -431,7 +431,10 @@
def shutdown(self):
for obj in pollable.instances.itervalues():
- obj.shutdown()
+ try:
+ obj.shutdown()
+ except error.SignalInterrupt:
+ pass
def run(self):
self.repowatcher.setup()
--- a/tests/test-merge-types.t Tue Apr 03 22:02:04 2012 +0200
+++ b/tests/test-merge-types.t Wed Apr 04 11:19:09 2012 +0200
@@ -89,7 +89,7 @@
a: versions differ -> m
preserving a for resolve of a
updating: a 1/1 files (100.00%)
- couldn't find merge tool hgmerge
+ (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re)
picked tool 'internal:prompt' for a (binary False symlink True)
no tool found to merge a
keep (l)ocal or take (o)ther? l