Question

I’m using mercurial and one problem I found while merging was the fact that it’s hard for a single developer to merge with the default trunk after a lot of changes.

So even if the developer resolves the conflicts by hand there is always a change to miss some of the intersecting changes.

I would like to take a look at the history of a merge and see the resolved files, so other developers can review it.

Can I view resolved files after a merge in hg?

Answer 1

What I like to do is this workflow:

hg pull
;; assuming I'm on development branch
hg merge -r default
hg diff  ;;do incoming changes look good
;; run tests 
hg commit -m "merged from others, lookin' good"
hg up default -C
hg merge -r development
hg diff   ;;everything look good still?
;; run tests
hg commit -m "And back to default, all tests pass"
hg push