# HG changeset patch
# User Artem Tikhomirov <tikhomirov.artem@gmail.com>
# Date 1305773152 -7200
# Node ID 04735ce6bed20bb122576a4df424bb12ed01a66b
# Parent  8de327242aa0aa03a42040bcdecaace473378487
NPE when one of the flags is non-null

diff -r 8de327242aa0 -r 04735ce6bed2 src/org/tmatesoft/hg/repo/HgStatusCollector.java
--- a/src/org/tmatesoft/hg/repo/HgStatusCollector.java	Thu May 19 04:14:45 2011 +0200
+++ b/src/org/tmatesoft/hg/repo/HgStatusCollector.java	Thu May 19 04:45:52 2011 +0200
@@ -224,7 +224,7 @@
 				Nodeid nidR2 = r2.nodeid(fname);
 				String flagsR1 = r1.flags(fname);
 				String flagsR2 = r2.flags(fname);
-				if (nidR1.equals(nidR2) && ((flagsR2 == null && flagsR1 == null) || flagsR2.equals(flagsR1))) {
+				if (nidR1.equals(nidR2) && ((flagsR2 == null && flagsR1 == null) || (flagsR2 != null && flagsR2.equals(flagsR1)))) {
 					inspector.clean(pp.path(fname));
 				} else {
 					inspector.modified(pp.path(fname));