X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fresolve_svn.sh;h=b75979738722604de485d217b321a6dc64104009;hb=d4a62cbb9a5841c8b2777014407cc0ed4257653d;hp=941e5729d5f04c7f36682e27e5582d3bc8771b5d;hpb=ba3dab0632f2eedfce6f724d76a9c967ccb9fe90;p=feisty_meow.git

diff --git a/scripts/rev_control/resolve_svn.sh b/scripts/rev_control/resolve_svn.sh
index 941e5729..b7597973 100644
--- a/scripts/rev_control/resolve_svn.sh
+++ b/scripts/rev_control/resolve_svn.sh
@@ -3,8 +3,19 @@
 # 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"
+
+##############
+
 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"