[Pkg-crosswire-devel] [GnomeSword-developers] Bits from Debian Crosswire Packaging Team

[Dmitrijs Ledkovs]

Hi there.

I have merged both histories of our packaging branch and the upstream
branch. I did this:

$ bzr branch lp:sword bridge # create a new checkoout
$ cd bridge
$ bzr branch lp:sword/debian subdir # create "full" checkout of the
packaging branch
$ bzr join subdir # force join the two histories together
$ bzr commit # now we have bridge/* and bridge/debian/* which are
identical except that there is bridge/debian/debian dir
$ bzr mv subdir/debian debian
$ bzr rm subdir # get rid of the duplicate source and move debian/ to top-level
$ bzr ci
$ bzr push lp:~pkgcrosswire/sword/bridge