naming fixes, terminal title fixes

[feisty_meow.git] / scripts / rev_control / resolve_svn.sh

diff --git a/scripts/rev_control/resolve_svn.sh b/scripts/rev_control/resolve_svn.sh
index 941e5729d5f04c7f36682e27e5582d3bc8771b5d..15acfd4afe79badf1a396228187445a0e1383583 100644 (file)
--- a/scripts/rev_control/resolve_svn.sh
+++ b/scripts/rev_control/resolve_svn.sh
@@ -3,8 +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"
+exit_on_error "resolving tree conflict by accepting the working directory as the right one"
 
+restore_terminal_title