[Opensim-dev] to branch or to break?

[Anders Arnholm]

On Fri, Nov 02, 2007 at 07:35:54AM -0400, Sean Dague wrote:

> I used to think this as well.  Then I started using hg a lot, and
> realized that I actually had a chance of merging correctly with hg
> (mercurial).  More importantly, you get to try the merge in your tree

That depens on if you are ok with it didn't conflict and something got
out that compiles, or you seen the need to understand the changes, what
they do, why thet do it that way and that the limitations of that
solution. In the end after a merge you have a diff, a change to
understand, if this are a big one it's much harder, this is the big
problem with all merging.

> None of those are distributed environments. :)  Distributed SCM is a
> relatively new idea that came out of building a tool that actually works
> for Linux Kernel development (lots of distributed developers).  Bit
> Keeper is the only proprietary offering in this space.

The braching and strategeies thet hg sais it offer is the same as we
always used on our projects. It might solve some of the techincal
problems with subversion, or clearcase, I'm however sure it doesn't
change the need to understand and to right whan mering the code.

With that I'll don't say that i'm not willing to try it, it sound like a
great tool, but it's not a like magic bullet.

/ Balp
-- 
      o_   Anders Arnholm,               HiQ - Consultant
 o/  /\    anders at arnholm.nu             Phone  : +46-703-160969
/|_, \\    http://anders.arnholm.nu/     http://www.hiq.se
/
`
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://opensimulator.org/pipermail/opensim-dev/attachments/20071102/0873034f/attachment-0001.pgp>