Re: Feedback on merging via bzr

2010-01-18 Thread Michael Bienia
On 2010-01-18 16:18:44 +1100, Andrew Bennetts wrote: That's right. If you're interested, bug 491711 https://bugs.launchpad.net/bzr/+bug/491711 is tracking progress on this, and there's a branch at adds the hook point going through code review at the moment. Perhaps there should be a

Re: Feedback on merging via bzr

2010-01-18 Thread Michael Bienia
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

Re: Feedback on merging via bzr

2010-01-18 Thread charlie
On Mon, 2010-01-18 at 12:07 +0100, Michael Bienia 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. This has bitten me a few times. When you go to a packages launchpad

Re: Feedback on merging via bzr

2010-01-18 Thread Dmitrijs Ledkovs
2010/1/18 Scott Kitterman ubu...@kitterman.com: I spent some time over the holidays giving merging via bzr and the UDD tools. I understand that development of the tools to support this is still a work in progress and the much of this feedback probably represents work that you already know

Re: Feedback on merging via bzr

2010-01-18 Thread Mathias Gug
On Mon, Jan 18, 2010 at 12:21 PM, Scott Kitterman ubu...@kitterman.com wrote: I usually use the ancestor revision shortcut for selecting the revision to diff: Ubuntu patch compared to the common base version: ~/src/pkg-name/lucid/ $ bzr diff -rancestor:../squeeze/ Debian patch compared to

Re: Feedback on merging via bzr

2010-01-18 Thread Barry Warsaw
On Jan 17, 2010, at 10:45 PM, Scott Kitterman wrote: I spent some time over the holidays giving merging via bzr and the UDD tools. I understand that development of the tools to support this is still a work in progress and the much of this feedback probably represents work that you already know

Re: Feedback on merging via bzr

2010-01-18 Thread Barry Warsaw
On Jan 17, 2010, at 10:45 PM, Scott Kitterman wrote: I spent some time over the holidays giving merging via bzr and the UDD tools. I understand that development of the tools to support this is still a work in progress and the much of this feedback probably represents work that you already know

Re: Feedback on merging via bzr

2010-01-18 Thread Scott Kitterman
On Mon, Jan 18, 2010 at 12:21 PM, Scott Kitterman ubu...@kitterman.com wrote: I usually use the ancestor revision shortcut for selecting the revision to diff: Ubuntu patch compared to the common base version: ~/src/pkg-name/lucid/ $ bzr diff -rancestor:../squeeze/ Debian patch compared

Re: Feedback on merging via bzr

2010-01-18 Thread Reinhard Tartler
On Mo, Jan 18, 2010 at 04:45:53 (CET), Scott Kitterman wrote: This method of diffing works fine, except that the previous branch has to be re- downloaded each time the diff is done. In this case I was trying to remove extraneous white space changes that had crept into the packages so it took

Re: Feedback on merging via bzr

2010-01-18 Thread Scott Kitterman
forgot mailing list sorry silly gmail So then you get to read the reply twice. ;-) -- Forwarded message -- From: Dmitrijs Ledkovs dmitrij.led...@gmail.com Date: 2010/1/18 Subject: Re: Feedback on merging via bzr To: Scott Kitterman ubu...@kitterman.com 2010/1/18 Scott