[Linux-ha-dev] Mercurial changes getting lost

[Lars Marowsky-Bree]

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.

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


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