Here's where you can see that: The changes from this delta are the ones that "got lost" http://hg.linux-ha.org/dev/annotate/da3a73d1d6d4/lrm/lrmd/lrmd.c
I did another commit, and the changes from that delta got lost: http://hg.linux-ha.org/dev/annotate/4b4fc04624bb/lrm/lrmd/lrmd.c Still gone here: http://hg.linux-ha.org/dev/annotate/c2d9d5cce14c/lrm/lrmd/lrmd.c And they have returned to the repository here: http://hg.linux-ha.org/dev/annotate/c5d0627925f0/lrm/lrmd/lrmd.c, and appear to be credited to Dejan as his changes. 1) I never edited out these changes 2) Dejan never added them back in 3) No one was asked to do a manual merge of anything AFAIK Here's the order of what happened: 1) I made changes for the first delta in a workspace 2) I made the changes for the 2nd delta in a different workspace which didn't have the changes from (1) in it 3) I committed the changes for (1) 4) Dejan brought those into his workspace 5) I committed the changes for (2) 6) Dejan committed the changes from his workspace This is pretty distressing. -- Alan Robertson <[EMAIL PROTECTED]> "Openness is the foundation and preservative of friendship... Let me claim from you at all times your undisguised opinions." - William Wilberforce _______________________________________________________ Linux-HA-Dev: [email protected] http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev Home Page: http://linux-ha.org/
