projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
added careful error checking to rev control
[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..3484a859915fd47a9fcd18e339b2693346c9b6d0 100644
(file)
--- a/
scripts/rev_control/resolve_svn.sh
+++ b/
scripts/rev_control/resolve_svn.sh
@@
-6,5
+6,6
@@
filename="$1"; shift
svn resolve --accept=working "$filename"
+test_or_die "resolving tree conflict by accepting the working directory as the right one"