[svk-commit] r2894 - in trunk: lib/SVK

[nobody at bestpractical.com]

Author: jesse
Date: Tue May 20 23:44:54 2008
New Revision: 2894

Modified:
   trunk/   (props changed)
   trunk/lib/SVK/Resolve.pm

Log:
 r31785 at 31b:  jesse | 2008-05-21 11:43:36 +0800
 * don't explod when an editor fails when doing a hand-mrege


Modified: trunk/lib/SVK/Resolve.pm
==============================================================================
--- trunk/lib/SVK/Resolve.pm	(original)
+++ trunk/lib/SVK/Resolve.pm	Tue May 20 23:44:54 2008
@@ -132,7 +132,10 @@
 sub edit {
     my $self = shift;
 
-    edit_file ($self->{merged});
+    eval { edit_file ($self->{merged}) };
+    if (my $err = $@) {
+        $logger->error(loc("External editor reported an error: %1.", $err));
+    }
     $self->{has_conflict} = index (read_file ($self->{merged}), $self->{marker}) >= 0;
 
     return 0;