← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to tools/packaging/update-packaging-branches.sh

  • Committer: Vincent Ladeuil
  • Date: 2010-02-10 15:46:03 UTC
  • mfrom: (4985.3.21 update)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
https://launchpad.net/bugs/113809
Update performs two merges in a more logical order but stop on conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/packaging/update-packaging-branches.sh
4
4
if [ -z "$UBUNTU_RELEASES" ]; then
5
5
    echo "Configure the distro platforms that you want to"
6
6
    echo "build with a line like:"
7
 
    echo '  export UBUNTU_RELEASES="dapper feisty gutsy hardy intrepid"'
 
7
    echo '  export UBUNTU_RELEASES="dapper feisty gutsy hardy intrepid jaunty"'
8
8
    exit 1
9
9
fi
10
10
 
11
11
for DISTRO in $UBUNTU_RELEASES; do
12
 
    if [ -d "packaging-$DISTRO" ] ; then
13
 
        echo "Updating packaging-$DISTRO"
14
 
        bzr update packaging-$DISTRO
 
12
    if [ -d "$PACKAGE-$DISTRO" ] ; then
 
13
        echo "Updating $PACKAGE-$DISTRO"
 
14
        bzr update $PACKAGE-$DISTRO
 
15
        if [ "$PACKAGE" = "bzr-svn" ] ; then
 
16
            cd $PACKAGE-$DISTRO
 
17
            bzr merge http://bzr.debian.org/pkg-bazaar/bzr-svn/unstable/
 
18
            cd ..
 
19
        fi
15
20
    else
16
 
        echo "Checking out lp:~bzr/bzr/packaging-$DISTRO"
17
 
        bzr co lp:~bzr/bzr/packaging-$DISTRO
 
21
        SRC="lp:~bzr/$PACKAGE/packaging-$DISTRO"
 
22
        if [ "$PACKAGE" = "bzr-svn" ] ; then
 
23
            SRC="lp:~bzr/$PACKAGE/beta-ppa-$DISTRO"
 
24
        fi
 
25
        echo "Checking out $SRC"
 
26
        bzr co $SRC $PACKAGE-$DISTRO
18
27
    fi
19
28
done
20