Question/idea about multiple developers committing to one branch

Nicholas Allen allen at ableton.com
Fri Dec 1 18:21:25 GMT 2006


I was just thinking about this a bit more and the need to reorder the 
revisions so you can push is already implemented isn't it? All you need 
to do is bind your branch to the mainline with a bzr bind command 
followed by a bzr update and it will do this for you won't it? So does 
bzr even need a --to option for the merge command?

Another problem I see with the --to option is if you use it to merge 
from mainline and someone else manages to push some revisions there 
whlie you resolve conflicts you won't be able to push again anyway.

I tried this scenario to see if it would work and it seems to. The only 
slightly undesirable thing is that the changes made on the branch are 
wrapped up as sub-revisions and shown as a pending merge:

"Your local commits will now show as pending merges with 'bzr status', 
and can be committed with 'bzr commit'."

What I would like is if the mainline has revision A, B and then the 
branch has A, C that after binding and updating your branch looks like 
A, B, C (and possibly D if conflicts needed to be resolved). What you 
actually end up with on the branch is A, B, D with subrevision C.

I know this wasn't explained well!

Nick




More information about the bazaar mailing list