[Linux-ha-dev] Re: Mercurial changes getting lost

[Lars Marowsky-Bree]

On 2007-05-20T12:54:45, Alan Robertson <alanr at unix.sh> wrote:

> Does silently throwing away changes when doing merges serve some purpose
> I've missed out on?

I assume that the chances of a pilot error or misunderstanding by
someone, somewhere are rather higher than a very popular and scalable
SCM getting such a fundamental thing wrong. So, the prudent line of
inquiry should not be as to the faults of the SCM, but towards user
operations.

Looking at dc0a8c89bbfd (which was dev at that time), that seems to
still have the change you want.  In 7db4c662e68c, you seem to have
pulled dev into your local workspace again; said workspace in question
seems to consist of nothing but pulls, merges and local changes, but no
pushes for a long time - until d2639cbc3351.

More to the point, that work space never merged the changes from
da3a73d1d6d4 (which is the delta you claim "lost") correctly: instead it
pulled from and merged dev (which at that time contained the changes) in
cc868e409675 by you - which _reverses!_ those changes, but only those to
lrmd.c. 

When finally pushed out in d2639cbc3351, that reversal also was pushed
out, and the changes "lost".

When Dejan committed his changes in c5d0627925f0, he apparently had your
changes in your workspace still, or had applied a patch with them
manually. So, when he committed them again, obviously they now showed up
as "his", because he touched the lines of code last.

But, the weird changeset is cc868e409675. It's hard to say what exactly
took place there. Maybe you didn't want to merge all changes and took
them out as part of the "merge", or in between the merge and commit
copied over some files locally, played with some patches or something?

I'm afraid noone but you can reconstruct how that happened, but I doubt
hg is at fault.

Does that help?


Sincerely,
    Lars

-- 
Teamlead Kernel, SuSE Labs, Research and Development
SUSE LINUX Products GmbH, GF: Markus Rex, HRB 16746 (AG Nürnberg)
"Experience is the name everyone gives to their mistakes." -- Oscar Wilde