← 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: Andrew Bennetts
  • Date: 2010-04-21 07:52:31 UTC
  • mto: This revision was merged to the branch mainline in revision 5176.
  • Revision ID: andrew.bennetts@canonical.com-20100421075231-2n8pfxbhlhqxic6w
https://launchpad.net/bugs/532435
Add example merge_file_content hook based on my answer to <https://answers.edge.launchpad.net/bzr/+question/103163>.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/packaging/update-packaging-branches.sh
18
18
            cd ..
19
19
        fi
20
20
    else
21
 
        SRC="lp:~bzr/ubuntu/$DISTRO/$PACKAGE/bzr-ppa"
 
21
        SRC="lp:~bzr/$PACKAGE/packaging-$DISTRO"
 
22
        if [ "$PACKAGE" = "bzr-svn" ] ; then
 
23
            SRC="lp:~bzr/$PACKAGE/beta-ppa-$DISTRO"
 
24
        fi
22
25
        echo "Checking out $SRC"
23
26
        bzr co $SRC $PACKAGE-$DISTRO
24
27
    fi