# HG changeset patch # User Artem Tikhomirov # Date 1325282662 -10800 # Node ID aa2e589d4e84ef716e6ff603a39a50e098ec6d8b # Parent a2341e761609ecd3c916ade3255c545af29be28d NPE in HgWCStatusCollector:initDirstateParentManifest (aka AssertionError in HgDirstate:parents()) diff -r a2341e761609 -r aa2e589d4e84 src/org/tmatesoft/hg/repo/HgDirstate.java --- a/src/org/tmatesoft/hg/repo/HgDirstate.java Thu Dec 22 02:37:10 2011 +0300 +++ b/src/org/tmatesoft/hg/repo/HgDirstate.java Sat Dec 31 01:04:22 2011 +0300 @@ -76,6 +76,7 @@ /*package-local*/ void read() throws HgInvalidControlFileException { normal = added = removed = merged = Collections.emptyMap(); + parents = new Pair(Nodeid.NULL, Nodeid.NULL); if (canonicalPathRewrite != null) { canonical2dirstateName = new HashMap(); } else {