projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-2.140.120' into dev
[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 b75979738722604de485d217b321a6dc64104009..15acfd4afe79badf1a396228187445a0e1383583 100644
(file)
--- a/
scripts/rev_control/resolve_svn.sh
+++ b/
scripts/rev_control/resolve_svn.sh
@@
-6,6
+6,8
@@
source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh"
source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh"
+save_terminal_title
+
##############
filename="$1"; shift
##############
filename="$1"; shift
@@
-16,6
+18,7
@@
if [ -z "$filename" ]; then
fi
svn resolve --accept=working "$filename"
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