# HG changeset patch
# User Artem Tikhomirov <tikhomirov.artem@gmail.com>
# Date 1350930800 -7200
# Node ID c1c8f6859d3ff6755d0b85128198cbdc7f3a9b1b
# Parent  abfbe81154b5180c975d25b83636535212c545fa
Recognize 'merged from parent' metastate in dirstate

diff -r abfbe81154b5 -r c1c8f6859d3f src/org/tmatesoft/hg/repo/HgWorkingCopyStatusCollector.java
--- a/src/org/tmatesoft/hg/repo/HgWorkingCopyStatusCollector.java	Fri Oct 19 16:03:21 2012 +0200
+++ b/src/org/tmatesoft/hg/repo/HgWorkingCopyStatusCollector.java	Mon Oct 22 20:33:20 2012 +0200
@@ -340,6 +340,10 @@
 				}
 			} else if (!sizeEqual && r.size() >= 0) {
 				inspector.modified(fname);
+			} else if (r.size() == -2) {
+				// DirState wiki calls this np2 metastate: 
+				// 'np2': merged from other parent (status == 'n', size == -2) 
+				inspector.modified(fname);
 			} else {
 				// size is the same or unknown, and, perhaps, different timestamp
 				// check actual content to avoid false modified files