summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Chu <jchu@xentac.net>2008-04-20 13:29:40 -0700
committerJason Chu <jchu@xentac.net>2008-04-20 13:30:00 -0700
commit0b36e8ecb3b9ec4dba9e52d795d20dc8623bbd99 (patch)
tree157d678caccfa1fbdb8016b43882a1842899acbc
parentf71a0fabb7770eb4319b33704f71b729142ed1fc (diff)
downloaddevtools32-0b36e8ecb3b9ec4dba9e52d795d20dc8623bbd99.tar.xz
Add a message that explains what to do when a merge conflict is detected and needs to be dealt with.
-rwxr-xr-xarchrelease8
1 files changed, 8 insertions, 0 deletions
diff --git a/archrelease b/archrelease
index 3644a76..dc86d3f 100755
--- a/archrelease
+++ b/archrelease
@@ -20,6 +20,14 @@ else
pushd ..
if [ -f trunk/svnmerge-commit-message.txt ]; then
svn commit -F trunk/svnmerge-commit-message.txt
+ if [ $? -ne 0 ]; then
+ # The user is going to have to clean things up a bit
+ echo "*** ATTENTION: There was a problem merging the package changes ***"
+ echo "To fix it, edit the conflicting files in repos/$1 (the ones that are C in svn status)."
+ echo "Once you have resolved conflicts, execute 'svn resolved <path to file>' to tell svn the error was resolved."
+ echo "Then to finish the merge commit, execute 'svn commit -F trunk/svnmerge-commit-message.txt' and, if there are no problems, delete trunk/svnmerge-commit-message.txt"
+ exit $?
+ fi
rm trunk/svnmerge-commit-message.txt
else
echo "Nothing to commit"