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

Tweaked test/mergedevbranch in a number of places in order to simplify handling (merging and testing) of multiple merges.

Browse source 
- Legacy-Id: 4963
This commit is contained in:
Henrik Levkowetz 2012-10-30 12:09:08 +00:00
parent 5eeb670b28
commit 4400ae2d25
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
test/mergedevbranch
View file

@ -124,7 +124,7 @@ else
die "Could not find a branch matching '$branch'"
fi
if grep "@$rev $branch" mergelog; then die "Changeset $branch@$rev is already in the merge log"; fi
if grep "@$rev $branch" mergelog; then note "Changeset $branch@$rev is already in the merge log. Skipping it."; exit 0; fi
note "Will attempt merge from $branch@$rev"
@ -182,5 +182,6 @@ else
echo "To commit it, run this commit command: ../cicmd/commit-$rev-merge.sh"
fi
echo -e "\n------------------------------------------------------------------------\n\n"