/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2009-06-12 18:05:15 UTC
  • mto: (4371.4.5 vila-better-heads)
  • mto: This revision was merged to the branch mainline in revision 4449.
  • Revision ID: john@arbash-meinel.com-20090612180515-t0cwbjsnve094oik
Add a failing test for handling nodes that are in the same linear chain.

It fails because the ancestry skipping causes us to miss the fact that the two nodes
are actually directly related. We could check at the beginning, as the 
code used to do, but I think that will be incomplete for the more-than-two
heads cases.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/packaging/update-packaging-branches.sh
9
9
fi
10
10
 
11
11
for DISTRO in $UBUNTU_RELEASES; do
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
 
12
    if [ -d "packaging-$DISTRO" ] ; then
 
13
        echo "Updating packaging-$DISTRO"
 
14
        bzr update packaging-$DISTRO
20
15
    else
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
 
16
        echo "Checking out lp:~bzr/bzr/packaging-$DISTRO"
 
17
        bzr co lp:~bzr/bzr/packaging-$DISTRO
27
18
    fi
28
19
done
 
20