Hi, here's what is going on here.

bazaar-webserve is a branch that contains a mirror of the upstream work.

This can be updated occasionally, but when we are doing releases it should only
be done when there is a new upstream release. When there is a new version
change to the bazaar-webserve branch and 

  bzr export ../tarballs/bazaar-webserve_<version>.orig.tar.gz

You'll have to do this to start off with, the current version is deemed to be
0~bzr165 before we get any releases.

debian is the branch with the debian/ dir of the package in it. Use bzr
builddeb in here to build the package.

The other branches are patches to the upstream code. If you want to add a new
patch then branch the upstream code to a new one and then hack in there.

When you want to include the patch in the package, or refresh an already 
exisiting patch then you commit the changes, merge in the upstream branch, 
then 

  bzr diff -rbranch:../bazaar-webserve/

which will create the diff. Read it over to check it, and then 
  
  bzr diff -rbranch:../bazaar-webserve/ > ../debian/patches/patch_name

and make sure there is an entry in debian/patches/series for it (followed by
-p0). Try and keep patch/branch names matching so that we can see what is 
going on.

You then change to the debian branch, add any missing files, commit, and build
the package.

For the time being are you just happy to send me bundles for any changes? I'll
work out somewhere to put the branches.

As there is no nested branch support in bzr yet I'm afraid you will have to 
branch each of them.


James