launchpad-dev team mailing list archive
-
launchpad-dev team
-
Mailing list archive
-
Message #04443
Re: Off-topic, interesting: git-flow
On 08/23/2010 09:09 AM, Paul Hummer wrote:
> On Thu, 19 Aug 2010 18:47:28 -0400
> Maris Fogels <maris.fogels@xxxxxxxxxxxxx> wrote:
>> It looks really interesting for developing smaller tools and
>> libraries, like the ecosystem that has developed around the Launchpad
>> project. It could be made into a bzr plugin, but we would have to
>> make sure the model supports code reviews ;)
>>
>> Something like this:
>>
>> $ bzr init-flow
>> $ cd dev
>> $ bzr feature start the-feature
>> ... hack ...
>> $ bzr send
>> $ bzr feature finish
>
> Here's a better version that exists today:
>
> $ bzr cbranch db-devel schema-change
> ... hack ...
> $ bzr lp-send
> $ bzr add-pipe model-change
> ... hack ...
> $ bzr lp-send
> $ bzr add-pipe ui-change
> ... hack ...
> $ bzr lp-send
>
> In this model, not only are you using "switch" but you're also building
> on the changes you've already made. lp-send is even smart enough to
> set the dependent branch in Launchpad so that you only get the diff
> from that single pipe, instead of the diff between the branch and
> db-devel.
Yes. And that combined with merge requests and tarmac makes for
Continuous Integration based on code reviews and not on post-push
test-and-hope. :)
To go off-topic of the off-topic: It would be great if pipelines could
do multiple non-dependent branches, or if bzr would get better support
for cherry picking - sometimes your work on different features really
isn't related to each other, but having an earlier branch rejected makes
dealing with later branches really tough.
Monty
References