hg merge preview

[Peter Toft]

 Hi there

 I often end in a situation, where I need to run "hg merge".

 $ hg heads
 changeset:   49:f119521796a0
 tag:         tip
 parent:      47:f92aa8fc1090
 user:        Peter Toft
 date:        Wed Aug 31 14:10:02 2011 +0200
 summary:     stuff

 changeset:   48:90ac163c1f15
 user:        Joe Gun
 date:        Wed Aug 31 14:10:10 2011 +0200
 summary:     stuff too :)

 It will normally go just fine, but I don't like that I don't have a 
 good "preview".
 I know "hg merge -P", but this does not tell anything about potential 
 merge conflicts.

 The second option I have is to do a "hg diff" on the two heads

  hg diff -r 49 -r 48 --stat
  A.txt |  2 +-
  C.txt |  2 +-
  D.txt |  1 -
  3 files changed, 2 insertions(+), 3 deletions(-)

 which does give some overview, but not anything like what I would like 
 (the format does not matter):

   From changeset 49:
    Updates: A.txt C.txt

   From changeset 48:
    Updates: A.txt D.txt

   Merge problem will be found in A.txt when running hg merge

 Especially the merge problem identification would be really nice.

 Are there better means to analyze the effect of hg merges before doing 
 them?

 Best

-- 
 Peter Toft, PhD
 http://petertoft.dk