Gotcha while trying to find guilty changeset...

Daniel Santa Cruz byteshack at gmail.com
Thu Jun 22 09:36:51 CDT 2006


We currently ran into a gotcha with HG, and would like to share the
experience in hopes it might help someone sometime.

We have a file that got a few lines added in changeset X.
Those lines disappear when we look at the file in the manifest for the
only child changeset of X.
We looked at the changeset as displayed by the web interfaces and by
"hg log -p" and there was no trace of those lines being changed.
Funny thing was that "hg log -v" reported that file as having changed
in the list of files changed.

Catch is that the child of X (call it X+1) is a merger changeset.  "hg
log -p" shows the patch as it relates to only one of the parents,
which makes sense.  It shows the patch as it relates to the first
parent.  On the web interface, we see the same thing as "hg log -p"
would show.

If you want to see what the changeset would look like if applied to
"the other parents", you must use "hg export --switch-parent".  There
doesn't seem to be a way to do that with "hg log".  I could not find a
way to see "the other changeset" from either of the 2 web interfaces.

Happy coding,
Daniel


More information about the Mercurial mailing list