[Linux-ha-dev] Mercurial changes getting lost

[Lars Marowsky-Bree]

On 2007-05-21T20:14:57, Dejan Muhamedagic <dejanmm at fastmail.fm> wrote:

> > 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. 

This is a distributed repository working at a changeset level, not at a
file level.

When several parties make independent changes on top of a common
ancestor (say, on top of dev) at the same time, you end up with several
branches of the tree. As one of you is bound to push to dev first, the
other one has to "pull" the new changes, merge them with his, and commit
that merge - to reconcile the tree into one trunk again.

The _merge_ shows up as having been done by that person, but not the
original changeset, which hg annotate uses.

If you're using hg log, you can use "-M" to skip merges.

Does that help?


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