Who here works on Subversion?

[Kevin D. Clark]

Christopher Schmidt writes:

> Except in the situation where main and dev are both altered in a
> conflicting way, Subversion doesn't offer any smart techniques for
> merging that I'm aware of.

The only <thing> that I've ever seen that was smart enough to resolve
overlapping conflicting changes as an actual human being.

> This is why I only use revision control as backup + examining diffs to
> give to the boss when they ask "What the heck did you spend 2 hours on?"
> :)

Hmm.  I use revision control systems as a tool and I depend on them to
do work for me.  This is one of my most important tools.  If I can't
trust this tool, I either replace it or complain bitterly.  You can't
build quality houses with broken levels and bent squares and dull
saws... 


Regards,

--kevin
-- 
GnuPG ID: B280F24E                     And the madness of the crowd
alumni.unh.edu!kdc                     Is an epileptic fit
                                       -- Tom Waits