Skip to content

Commit

Permalink
Merge pull request #19 from degasus/buildbot_try_branches
Browse files Browse the repository at this point in the history
buildbot: reset to upstream known revision
  • Loading branch information
delroth committed Jan 31, 2014
2 parents b5b02de + 9d87b8b commit 91fc1d7
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Tools/buildbot-try.sh
Expand Up @@ -28,8 +28,11 @@ shortrev=$(git describe --always --long --dirty=+ | sed 's/-g[0-9a-f]*\(+*\)$/\1

author=$(grep try_username "$opt_file" | cut -d "'" -f 2)

baserev=$(git merge-base HEAD origin/master)

echo "Branch name: $branchname"
echo "Change author: $author"
echo "Short rev: $shortrev"
echo "Base rev: $baserev"

buildbot try --properties=branchname=$branchname,author=$author,shortrev=$shortrev $*
git diff -r $baserev | buildbot try --properties=branchname=$branchname,author=$author,shortrev=$shortrev --diff=- -p1 --baserev $baserev $*

0 comments on commit 91fc1d7

Please sign in to comment.