On Mon 12 May 2008 at 09:07PM, Richard Lowe wrote:
>
> (I seem to ask this question a lot).
>
> Trash by user error or mis-merge, or via use of the onnv-scm tools?
Probably at least initiated by user error-- although I can remember a
few months ago doing some kind of merge mistake, followed by flailing to
try to fix it, followed by some sort of Hg meltdown. It has been a few
months since I've had this happen. In another incident, I think at some
point in an old version, I did a 'recommit' then a 'rollback' and
the tools got confused. I haven't tried that recently-- once burned
twice shy.
Also at one point, Hg seemed happy to let you commit stuff (by accident)
that had merge markers in it. IIRC that's been fixed.
That said, I don't know how well I've tracked the latest SCM-migration
bits. I periodically re-get them from the website tarball, but they're
not date stamped, so it's hard to know.
> we're going to expose a whole bunch of people to this stuff, sooner
> rather than later, anything that indicates a problem is of importance.
Sooner is better than later. We had stone tools for so many years--
we'll cope just fine when change comes :)
-dp
--
Daniel Price - Solaris Kernel Engineering - dp at eng.sun.com - blogs.sun.com/dp
