[rfc] bzr-colo into core

[Max Kanat-Alexander]

On 03/21/2011 02:37 PM, Jelmer Vernooij wrote:
> What do you do with your local commits when you connect up to trunk
> again? Do you push a merge commit with them or do you handle them some
> other way?

	We actually have an interesting workflow for the situation where I'm
using local commits. Basically, I have a "development checkout" where I
do a lot of development, but never commit to the central repository from
it. In this there's a configuration file that I change and then commit
locally, so that my config changes don't show up in any diffs. Then I
post a diff somewhere, it gets reviewed, and then I have a separate
checkout that I apply the diff to and commit from there.

	After I do "bzr up" on the checkout with my local commits, I just "bzr
commit --local" the config file again.

	-Max
-- 
http://www.bugzillasource.com/
Competent, Friendly Bugzilla, Perl, and IT Services