On 18 Jan 2010 12:07:41 +0100, "Michael Bienia" <mich...@bienia.de> wrote: > On 2010-01-17 22:45:53 -0500, Scott Kitterman wrote: > > Currently I often insert a step 0 before starting on merging with bzr: > - Check if the Debian branch is uptodate. > > Perhaps I got unlucky when picking a package to merge but several of the > packages I wanted to merge had outdated Debian branches so I had to do > it by hand (download the Debian .dsc and the Ubuntu delta from PTS and > merge it).
Yes, this has been a problem due to operational issues. I hope that it will be far less frequent in future. I'm sorry you got hit repeatedly. > I usually do a "bzr init-repo" before and branch both the Ubuntu and > Debian branch and use the local Debian branch for merging and diffing. > > It would be really nice if bzr warned one if the format of local branch > and the remote repository differ *before* I start working on something. Please file a bug against bzr. Thanks, James -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel