1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | #bzr branch lp:unity8
bzr branch ~/phablet/unity8/unity8
cd unity8
bzr pull
bzr diff
cd ..
wget "https://code.launchpad.net/~unity-team/unity8/trunk/+activereviews" -O output
branches=`grep lp:~ output`
cd unity8
for branch in $branches; do
bzr merge $branch &> /dev/null
if [ $? -ne 0 ]; then
echo $branch
bzr revert &> /dev/null
bzr merge $branch | grep -i conflict
echo ""
echo ""
fi
bzr revert &> /dev/null
done
cd ..
rm -rf unity8
rm -rf output
|