Re: My git-based Ubuntu package merge workflow

2016-09-29 Thread Daniel Holbach
Hey Nish, On 28.09.2016 20:55, Nish Aravamudan wrote: > On 27.09.2016 [10:48:33 +0200], Daniel Holbach wrote: >> On 04.08.2014 18:17, Robie Basak wrote: >>> I thought it was about time that I shared my own merge workflow, as I >>> think it is quite different from most other Ubuntu developers. I'm

Re: My git-based Ubuntu package merge workflow

2016-09-28 Thread Nish Aravamudan
On 27.09.2016 [10:48:33 +0200], Daniel Holbach wrote: > Hey hey, > > > On 04.08.2014 18:17, Robie Basak wrote: > > I thought it was about time that I shared my own merge workflow, as I > > think it is quite different from most other Ubuntu developers. I'm an > > advanced git user (even a

Re: My git-based Ubuntu package merge workflow

2016-09-27 Thread Daniel Holbach
Hey hey, On 04.08.2014 18:17, Robie Basak wrote: > I thought it was about time that I shared my own merge workflow, as I > think it is quite different from most other Ubuntu developers. I'm an > advanced git user (even a fanatic, perhaps), and I make extensive use of > git's interactive rebase

Re: My git-based Ubuntu package merge workflow

2016-01-14 Thread Robie Basak
A followup on how this has developed. We're adopting this workflow in the Canonical Server Team (and anyone else who wants to join us!). It is particularly useful for bigger deltas or when much churn has happened since the last merge, so is particularly relevant for a bunch of server packages on

Re: My git-based Ubuntu package merge workflow

2014-08-05 Thread Martin Pitt
Hello Robie, thanks for the writeup! I'm in a similar situation with the systemd package which had quite an enormous delta, and even after some huge efforts of cleaning it up and moving stuff to Debian it's still quite large. Robie Basak [2014-08-04 17:17 +0100]: 2. Break down the Ubuntu

Re: My git-based Ubuntu package merge workflow

2014-08-05 Thread Robie Basak
On Tue, Aug 05, 2014 at 03:31:03PM +0200, Martin Pitt wrote: If you maintain a package which already is in git in Debian, I warmly recommend that instead, as locally maintained git branches/patches tend to get lost or outdated. Absolutely. If everything is already in git and logically

My git-based Ubuntu package merge workflow

2014-08-04 Thread Robie Basak
I thought it was about time that I shared my own merge workflow, as I think it is quite different from most other Ubuntu developers. I'm an advanced git user (even a fanatic, perhaps), and I make extensive use of git's interactive rebase feature. To me, an Ubuntu package merge is just a rebase in