X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fresolve_svn.sh;h=15acfd4afe79badf1a396228187445a0e1383583;hb=7c7d191539d4e5a94c4b39433e32b05deab44f24;hp=3484a859915fd47a9fcd18e339b2693346c9b6d0;hpb=170a8e062d9283e65716e7aa55930ade13a66f7a;p=feisty_meow.git

diff --git a/scripts/rev_control/resolve_svn.sh b/scripts/rev_control/resolve_svn.sh
index 3484a859..15acfd4a 100644
--- a/scripts/rev_control/resolve_svn.sh
+++ b/scripts/rev_control/resolve_svn.sh
@@ -3,9 +3,22 @@
 # resolves a tree conflict by accepting the "working" version,
 # which effectively makes your current change the accepted one.
 
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
+source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh"
+
+save_terminal_title
+
+##############
+
 filename="$1"; shift
 
+if [ -z "$filename" ]; then
+  echo "This script needs a filename to operate on."
+  exit 1
+fi
+
 svn resolve --accept=working "$filename"
-test_or_die "resolving tree conflict by accepting the working directory as the right one"
+exit_on_error "resolving tree conflict by accepting the working directory as the right one"
 
+restore_terminal_title