hg merge preview

[Peter Toft]

On Wed, 31 Aug 2011 15:14:13 +0200, Mads Kiilerich wrote: 

> On
08/31/2011 03:06 PM, Martin Geisler wrote:
>> Peter Toft writes: 
>>

>>> Especially the merge problem identification would be really nice.
Are there better means to analyze the effect of hg merges before doing
them?
>> Not really -- to identify the problems you will have to run
(simulate) the merge process. So the best you can do is to do it
non-interactively and then revert back to where you were. Start the
merge with: $ hg merge --tool internal:merge
> - at which point you can
look for conflict markers in the files to see where there are
conflicting edits. You can also easily see the diff relative to each of
the potential parents: hg diff -r 'p1()' hg diff -r 'p2()' (see 'hg help
revset') If you don't care about that you can use internal:fail instead.
/Mads

Hej^H^H ... Hi Mads 

I cannot get this to work. 

Is this 'p1()'
syntax added to a recent HG version? 

At the moment I use version 1.7.5


Best 

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

Links:
------
[1]
mailto:pto at linuxbog.dk
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20110831/aa6c090c/attachment-0002.html>