incorrect base rev exported for merge?

[Georg]

Hi,

I'm running into some strange conflicts while trying to merge.  One of them
I followed up to understand what's going on.

This file was changed a number of times in the ancestry of the version I'm
merging into.  It was *not* changed in the ancestry of the version I'm
merging from.  I.e. the last change to this file in the ancestry of the
merge-from version was way before the common ancestor in the tree:

    merge-from              merge-into
        |                       |
        |                       *
        |                       |
        |                       |
        |                       *
        |                       |
        |                       *
        |                       |
        |                       *   <--- OOPS?
        |                       |
        \                       /
         \                     /
          \                   /
           \                 /
            \               /
             \             /
              \           /
               \         /
                \       /
                 \     /
                  \   /
                   \ /
                    + <-- common tree ancestor
                    |
                    |
                    |
                    * <--- EXPECTED BASE
                    |
                   ...

(where '+' is common ancestor in tree, '*' are changes to the particular
file)

The merge tool shows base, into, and from versions of the file.  Into and
from versions are correct, but base is not the version I marked as expected
base above.  Instead the base version shown in the merge tool seems to be
the "oops" version.

Could that be a one-off error when indexing the revlog, while exporting the
base version?

Hg is version 3be4785f8994 plus my local hgk patches (colorization and
such).

--
Regards,
Georg.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20070613/c01d39ff/attachment-0001.html>