Some feedback on colo plugin
Stefan Monnier
monnier at iro.umontreal.ca
Sat Feb 13 02:48:55 GMT 2010
>> status). Such a "bzr colo-merge" might look very similar to bzr
>> pipelines/looms.
> I don't understand the last sentence. pipelines and looms are
> intended to *postpone* merges, or more generally to provide a
> (limited) ability to edit the DAG.
Looms are sequences of "branches" where each branch adds some changes to
the previous (and each such branch "tracks" the previous), so when you
pull some change from upstream into the bottom "branch", you have to
merge that up through each one of the "branches".
That's exactly what "bzr colo-merge" would need to do as well.
Stefan
More information about the bazaar
mailing list