Problem with importing a merge changeset

Julian Cowley julian at lava.net
Sun May 18 05:45:42 UTC 2008


I'm having a problem with the hg import command.  Say I have a repo with 
the following:

    o    changeset:   3:aed80a0542a6
    |\
    | o  changeset:   2:43201c19d28d
    | |
    o |  changeset:   1:258012f5089c
    |/
    o    changeset:   0:0518cfc51257

After changeset 0, the repo is cloned.  Changeset 2 is committed to the 
original.  Changesets 1 and 3 are committed to the clone and then exported 
using hg export.

When I try to import the changesets from the clone into the original repo, 
I get this:

    $ hg import --exact ../export-changeset-1
    applying ../export-changeset-1
    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    $ hg import --exact ../export-changeset-3
    applying ../export-changeset-3
    abort: cannot partially commit a merge (do not specify files or patterns)

The error message happens even when --force is used.

It seems this change comes from the hg repo, changeset 0d4e068e9e52:

    commit: when committing the results of a merge, it's all or nothing

    Previously, it was possible to commit just one file from a merge, which
    is essentially always the wrong thing to do.  This fixes issue 1049.

I can fully understand this error message when merging with a specific 
file name, but not when importing a merge changeset (which should be 
considered complete and not partial).

-- 
The revolution has been cancelled due to low ratings.



More information about the Mercurial mailing list