[Linux-ha-dev] Mercurial changes getting lost

[Dejan Muhamedagic]

On Mon, May 21, 2007 at 06:22:59PM +0200, Lars Marowsky-Bree wrote:
> On 2007-05-21T18:19:58, Dejan Muhamedagic <dejanmm at fastmail.fm> wrote:
> 
> > Hi,
> > 
> > This is sort of a new branch of this thread... :)
> > 
> > And this time it is the other way around: changes done by me (and
> > possibly others) are credited to Alan ;-) Or am I missing
> > something. At any rate, they show in more than one changeset.
> > Here goes:
> > 
> > $ hg log -r 7052caef59e5
> > changeset:   10577:7052caef59e5
> > parent:      10576:4b4fc04624bb
> > parent:      10525:f3fed6ba5f59
> > user:        Alan Robertson <alanr at unix.sh>
> > date:        Fri Apr 27 14:02:20 2007 -0600
> > summary:     Merge in from upstream
> 
> That's a merge. Alan did the merge, so those changes show up as his; if
> you run hg annotate on a file, those will be fine.

Yes, I noticed that annotate shows the thing OK. I still don't get
it. Suppose that this little stupid brain of mine will get over
that one fine day. 

> Could we all please get over the fact that mercurial is different from
> CVS, and that it is even documented to be? ;-)

Don't know much about CVS, so can't compare.

> 
> 
> Regards,
>     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 at lists.linux-ha.org
> http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
> Home Page: http://linux-ha.org/

On Mon, May 21, 2007 at 07:15:51PM +0200, Andrew Beekhof wrote:
> On 5/21/07, Dejan Muhamedagic <dejanmm at fastmail.fm> wrote:
> >Hi,
> >
> >This is sort of a new branch of this thread... :)
> >
> >And this time it is the other way around: changes done by me (and
> >possibly others) are credited to Alan ;-) Or am I missing
> >something. At any rate, they show in more than one changeset.
> >Here goes:
> >
> >$ hg log -r 7052caef59e5
> >changeset:   10577:7052caef59e5
> >parent:      10576:4b4fc04624bb
> >parent:      10525:f3fed6ba5f59
> >user:        Alan Robertson <alanr at unix.sh>
> >date:        Fri Apr 27 14:02:20 2007 -0600
> >summary:     Merge in from upstream
> >
> >$ hg log -p -r 7052caef59e5 | grep ^diff
> >...
> >diff -r 4b4fc04624bb -r 7052caef59e5 lrm/test/README.regression
> >diff -r 4b4fc04624bb -r 7052caef59e5 lrm/test/defaults
> >diff -r 4b4fc04624bb -r 7052caef59e5 lrm/test/descriptions
> >... (more left out)
> >
> >I know for sure that those were done by me and these are at least
> >two changesets:
> >
> >changeset:   10508:ff3bde9f4bfb
> >user:        Dejan Muhamedagic <dejan at hello-penguin.com>
> >date:        Mon Apr 23 13:47:04 2007 +0200
> >summary:     LRM regression tests: lrmregtest takes place of the ocf RA 
> >Dummy.
> >
> >changeset:   10483:fc10f0139f81
> >user:        Dejan Muhamedagic <dejan at hello-penguin.com>
> >date:        Wed Apr 18 14:06:32 2007 +0200
> >summary:     LRM regression testing: updated readme.
> >
> >Confused and looking for more resources on hg.
> 
> can i suggest people are fundamentally looking in the wrong place.
> 
> better to try the mercurial list:
>   mercurial at selenic.com
> 
> or maybe wander into the chat room at:
>   irc.freenode.net#mercurial
> 
> of course there is also the wiki
>   http://www.selenic.com/mercurial/wiki/
> 
> or you could file a bug at:
>   http://www.selenic.com/mercurial/bts/
> 
> all places far more appropriate than a clustering development mailing list
> 
> even google.com would have been a better starting point than here.

Thanks for all the pointers.

> 
> >
> >Cheers,
> >
> >Dejan
> >
> >On Thu, May 17, 2007 at 07:44:55AM -0600, Alan Robertson wrote:
> >> 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 <alanr at unix.sh>
> >>
> >> "Openness is the foundation and preservative of friendship...  Let me
> >> claim from you at all times your undisguised opinions." - William
> >> Wilberforce
> >> _______________________________________________________
> >> Linux-HA-Dev: Linux-HA-Dev at 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 at 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 at lists.linux-ha.org
> http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
> Home Page: http://linux-ha.org/


-- 
Dejan