Merge not merged...

[Martin Geisler]

Kevin <kevin.waterson at gmail.com> writes:

> I have performed a merge of my default branch from another branch.
> Many of the files show large differences when I do
> hg diff -r default

When you've done 'hg merge', your working copy contain all the new stuff
From the other branch. That is the point of the merge: to integrate
changes from another branch into your current branch.

If you then run 'hg diff -r default', you're comparing the working copy
to the tip-most changeset on default. The differences you see are
exactly the changes that were brought in from the other branch.

Graphically (you'll need to view the message with a monospace font for
this to work) your situation looks like this:

  ... --- d1 --- d2 --- d3 --- d4 -- (working copy)
            \                       /
             b1 --- b2 --- b3 --- b4

Here the dX changesets are on default and the bX changesets are on some
other branch.

When you run 'hg diff -r default' you're comparing your working copy
with d4. Since you've merged b1-b4 into d4, you'll see roughly the same
output as from 'hg diff -r b1:b4'. I say roughly since the output is
different to account for any merge conflicts that you've resolved when
you did the merge.

Likewise, if you do 'hg diff -r b4' after 'hg merge', you'll see all the
changes made from d1 to d4.

> hg status does not show any any unmerged files.

You cannot see if a file is merged or not with 'hg status', you need to
use 'hg resolve --list' for that.

> The merge seems like it was completed, yet the differences remain.
>
> What do I need to do to resolve this?

I think you're ready to commit the merge.

-- 
Martin Geisler
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20120920/e225dbc0/attachment.asc>