How to spot a clean/non-clean Mercurial update

[Peter Toft]

Hi again 

I need your help to predict whether a "hg pull -u" will
give a clean update or not. 

Assume two scenarios; 

a) that I have
(e.g. a) 3-line file where I have edited line 3, and there is an
incoming change in line 1 

b) that I have (e.g. a) 3-line file where I
have edited line 1, and there is an incoming change in line 1 

In case
a) with "hg pull -u" I get a clean update (see below) but in case b)
Meld is needed. 

I want to predict whether I end in case a) or b) -
without changing the state of my files? 

Ideas? 

--- 

My .hgrc
currently uses "meld" for merges 

[ui]
merge=meld 

# options for meld,
change order of columns to be more logical 

[merge-tools]
meld.priority
= 100
meld.premerge = True
meld.args = $other $local $base 

-- 

Best


Peter 

-- 
Peter Toft, PhD
http://petertoft.dk
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20121212/789b12ff/attachment-0002.html>