Hi, On Sun, May 20, 2007 at 10:15:47PM +0200, Lars Marowsky-Bree wrote: > On 2007-05-20T12:54:45, Alan Robertson <[EMAIL PROTECTED]> 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?
$ hg log -r cc868e409675 lrm/lrmd/lrmd.c $ hg log -r d2639cbc3351 lrm/lrmd/lrmd.c show nothing. Does that mean that these changesets have nothing to do with the lrmd.c? > I'm afraid noone but you can reconstruct how that happened, but I doubt > hg is at fault. Alan: perhaps you should take this to the HG mailing list (I suppose there is one). Alan's changes were in my local repository and I never did anything special to preserve them. Actually, it was Alan who noticed that his patch became part of mine while he has been reviewing it. The funny thing is that they were there all the time and I tend to pull changes fairly regularly. Or maybe I missed the very latest developments because of my failing internet connection (at least something good could have come out of that). At any rate, I got scared too. I found this book: http://hgbook.red-bean.com/. Looks decent. Any other good resources on HG? Cheers, Dejan > > 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 > > _______________________________________________________ > Linux-HA-Dev: Linux-HA-Dev@lists.linux-ha.org > http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev > Home Page: http://linux-ha.org/ _______________________________________________________ Linux-HA-Dev: Linux-HA-Dev@lists.linux-ha.org http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev Home Page: http://linux-ha.org/
