Merging repositories

[Steve Borho]

On Mon, Jun 22, 2009 at 2:45 PM, Gregory
Malecha<gmalecha at eecs.harvard.edu> wrote:
> Hello,
>
> i am trying to merge two repositories but i get stuck in a very weird state.
> Here's what i did:
>
> gmalecha at x-mobile ~/work/research/ynot-rdb/examples/rdb $ hg ci
> gmalecha at x-mobile ~/work/research/ynot-rdb/examples/rdb $ hg pull
> ssh://eecs.harvard.edu//groups/ynot/hg-root/ynot
> pulling from ssh://eecs.harvard.edu//groups/ynot/hg-root/ynot
> searching for changes
> adding changesets
> adding manifests
> adding file changes
> added 31 changesets with 130 changes to 65 files (+1 heads)
> (run 'hg heads' to see heads, 'hg merge' to merge)
> gmalecha at x-mobile ~/work/research/ynot-rdb/examples/rdb $ hg heads
> changeset:   654:50a5fb47a366
> tag:         tip
> user:        Adam Chlipala <adamc at hcoop.net>
> date:        Mon Jun 15 14:01:00 2009 -0400
> summary:     Paper release; change bit that discusses Isabelle
>
> changeset:   623:5d860db401de
> user:        Gregory Malecha <gmalecha at eecs.harvard.edu>
> date:        Mon Jun 22 15:38:47 2009 -0400
> summary:     More stuff in the BTree.
>
> gmalecha at x-mobile ~/work/research/ynot-rdb/examples/rdb $ hg merge
> abort: outstanding uncommitted changes
> gmalecha at x-mobile ~/work/research/ynot-rdb/examples/rdb $ hg update
> abort: crosses branches (use 'hg merge' or 'hg update -C' to discard
> changes)
> gmalecha at x-mobile ~/work/research/ynot-rdb/examples/rdb $ hg merge
> abort: outstanding uncommitted changes
> gmalecha at x-mobile ~/work/research/ynot-rdb/examples/rdb $ hg diff
> gmalecha at x-mobile ~/work/research/ynot-rdb/examples/rdb $ hg ci
> nothing changed
>
>
> Can anyone help me with this? What causes it? How do i resolve it now and
> how to i avoid it in the future?

Two important commands to use when about to merge:

hg status
hg parents

Between the two of them you should be able to get a picture of what
has happened, and will happen.

--
Steve Borho