Maintaning local changes

Alexander Belchenko bialix at ukr.net
Thu Aug 27 07:42:07 BST 2009


Alexander Belchenko пишет:
> Ivan Sagalaev пишет:
>> I have an upstream branch with which I synchronize periodically and it's
>> used as an upstream branch by other developers. Sometimes it happens
>> that I need to do some changes to code that make sense only to my local
>> environment (temporary hacks, local config changes). I'd like to have
>> these changes in all my local branches but I don't want them to be
>> pushed upstream.
>>
>> The only (inconvenient) solution that I can think of is to have one
>> local branch dedicated to testing that will contain those environment
>> modifications. Then I do development in other branches and every time I
>> need to test my work I merge it to this test branch, test it and revert
>> it back to "upstream state + environment mods" every time.
>>
>> Is there a better solution?
> 
> I think you can use loom plugin[1] for this: convert one your working branch to loom, use mirror of
> upstream as base thread and make the another thread above with your private fixes. Then you can
> update upstream and auto-merge new upstream revisions with your fixes.

There is also bzr-pipeline plugin with similar functionality.
See https://launchpad.net/bzr-pipeline




More information about the bazaar mailing list