fwiw, the branch at http://people.samba.org/bzr/jelmer/bzr-builddeb/trunk contains the changes from this branch as well as the get-orig-source branch, the merge-upstream-branch branch and improvements to support merging from upstream svn branches and to support "bzr mu -r", with all the conflicts resolved.
fwiw, the branch at http:// people. samba.org/ bzr/jelmer/ bzr-builddeb/ trunk contains the changes from this branch as well as the get-orig-source branch, the merge-upstream- branch branch and improvements to support merging from upstream svn branches and to support "bzr mu -r", with all the conflicts resolved.