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

Tweaked the mergedevbranch script.

Browse source 
- Legacy-Id: 5679
This commit is contained in:
Henrik Levkowetz 2013-04-21 15:01:53 +00:00
parent e2ce73a18f
commit 231034879f
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bin/mergedevbranch
View file

@ -142,8 +142,13 @@ echo -e "#!/bin/bash\n\nsvn commit -m \"Merged [$rev] from $who: ${comment/\"/\'
chmod +x ../cicmd/commit-${rev}-merge.sh
note "Do the merge:"
svn merge -c $rev ${repo}/$branch . || die "Merge of $branch @$rev failed. The merge command was:
svn merge -c $rev ${repo}/$branch ."
if [[ $rev =~ : ]]; then
svn merge -r $rev ${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 ${repo}/$branch ."
fi
M=$(svn st | cut -c 1-7 | grep -oh 'M' | head -n 1)
C=$(svn st | cut -c 1-7 | grep -oh 'C' | head -n 1)