altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Added the --ignore-space-change switch to both the svn diff and merge commands in bin/mergedevbranch, to avoid spending time on editors that frivolously changes whitespace. Didn't occur to me earlier that the merge command might be able to do this, but it can. Splendid.

Browse source 
- Legacy-Id: 10547
This commit is contained in:
Henrik Levkowetz 2015-12-07 18:08:01 +00:00
parent 363630f389
commit afd9b70bbd
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bin/mergedevbranch
View file

@ -116,7 +116,9 @@ fix=$3
repo=$(echo -n "$(svn info | grep "^Repository Root: " | sed 's/Repository Root: //')")
note "Identify the branch:"
if svn info ${repo}/personal/$branch > /dev/null 2>&1; then
if svn info $branch > /dev/null 2>&1; then
branch="${branch#^/}"
elif svn info ${repo}/personal/$branch > /dev/null 2>&1; then
branch="personal/$branch"
elif svn info ${repo}/branch/$branch > /dev/null 2>&1; then
branch="branch/$branch"
@ -147,7 +149,7 @@ read -p "Continue with diff? [Y/n] "
[ "$REPLY" = "Y" -o "$REPLY" = "y" -o "$REPLY" = "" ] || exit
note "Diff:"
svn diff -c $rev $repo/$branch | less
svn diff -c $rev -x"-u -b" $repo/$branch | less
echo ""
read -p "Additional descriptive text (hit return for none): "
@ -163,10 +165,10 @@ read -p "Continue with the merge? [Y/n] "
note "Do the merge:"
if [[ $rev =~ : ]]; then
svn merge -r $rev ${repo}/$branch . || die "Merge of $branch @$rev failed. The merge command was:
svn merge -r $rev -x"-u -b" ${repo}/$branch . || die "Merge of $branch @$rev failed. The merge command was:
svn merge -r $rev ${repo}/$branch ."
else
svn merge -c $rev ${repo}/$branch . || die "Merge of $branch @$rev failed. The merge command was:
svn merge -c $rev -x"-u -b" ${repo}/$branch . || die "Merge of $branch @$rev failed. The merge command was:
svn merge -c $rev ${repo}/$branch ."
fi