Re: crm versions in CVS
"Eric S. Johansson" <[email protected]>
| Newsgroups | gmane.mail.spam.crm114 |
|---|---|
| Message-ID | <[email protected]> |
Corey Halpin wrote: > On 2008-03-26, Johannes Berg wrote: >> While that is possible, the resulting trees will most likely not be >> mergeable because at some point some slightly different patch >> description will creep in. > > I see two points here: > 1. under a dvcs, trees diverge over time and become difficult (sometimes > impossible) to merge. This would seem to be a general problem of any > distributed system, and also one that is media independent. Having created two divergent branches on my own (working on two different virtual machines), sometimes it works right, sometimes it doesn't. I've had the fewest failures with bzr. > 2. Slightly different patch descriptions cause problems under git. I've not > used git in a multi-person setting, and am not terribly familiar with its > quirks. So I really don't know what this means. This is why you want a dvcs that uses its own patch format without any user control. Fewer ways to screw up. > As to problem #1, I don't see how a central server solves it. Notifies you > sooner maybe, but doesn't the problem still exist? There are always merge problems. The question to ask is "how hard is it to repair them". Some systems have been horrible, others not so bad. The other question to ask is "how hard is it to screw up a merge". The answer for every single system I have used is "not very". > It just seems, at least to me, that for a dvcs which supports patch exchange > over email, there should be some functional workflow which doesn't require > anyone to have a central server. Maybe it requires a little bit more book > keeping than with a central server, sure. But it's got to be less book work > than the devs do now. bzr supports a variety of modes of operation which are really nice. Instead of giving you a garbled description of what they do, look at this document specifically chapters 3-6 http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/index.html I think the development model outlined in 6.3 (distributed with gatekeeper) would be most appropriate for this project. ---eric -- Speech-recognition in use. It makes mistakes, I correct some. ------------------------------------------------------------------------- Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace