Bazaar NG workflow question
Nicholas Allen
allen at ableton.com
Wed Oct 25 11:04:54 BST 2006
Hi,
We are currently looking into using Bazaar-NG for our repositories. We
are very interested in the smart server that you are working on but have
a question regarding it.
Is it possible for multiple developers to push to the same server so
long as there are no conflicts? For example, 2 developers have branches
off the trunk and one developer pushes his changes to the smart server
and then the other developer decides to do the same. We do not want that
the second developer would have to merge the trunk back into his private
branch first before he can merge his changes into the trunk. Only if
there are conflicts with the first developer would this be needed. So
essentially the server accepts requests to merge in changes (would these
be bzr bundles?) into itself from the private branches and only if it
encounters a conflict while doing so will it ask that developer to merge
trunk to his private branch.
This would be similar to how svn will allow you to commit to the server
as long as you have not modified a file that has been modified on the trunk.
The reason I ask is that we have a high commit rate on the trunk and
always having to keep merging the trunk into your branch before you can
push your changes to the trunk would be annoying.
I hope my question is not a stupid one. Bzr really looks like an amazing
VCS!
Thanks in advance,
Nicholas Allen
More information about the bazaar
mailing list