From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 8 Oct 2013 23:15:05 +0000 (-0400)
Subject: new script to resolve tree problem for svn.
X-Git-Tag: 2.140.90~907^2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=e81f45c55fb9ac42e1ce57fc50fa3cfb2b407e3a;p=feisty_meow.git

new script to resolve tree problem for svn.
---

diff --git a/scripts/rev_control/fix_svn_item.sh b/scripts/rev_control/fix_svn_item.sh
new file mode 100644
index 00000000..64eabaa5
--- /dev/null
+++ b/scripts/rev_control/fix_svn_item.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# resolves a tree conflict by accepting the "working" version,
+# which effectively makes your current change the accepted one.
+
+filename="$1"; shift
+
+svn resolve  --accept=working "$filename"