Mercurial > jhg

changeset 371:aa2e589d4e84

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
NPE in HgWCStatusCollector:initDirstateParentManifest (aka AssertionError in HgDirstate:parents())
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Sat, 31 Dec 2011 01:04:22 +0300
parents a2341e761609
children 155c1893bda4
files src/org/tmatesoft/hg/repo/HgDirstate.java
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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.<Path, Record>emptyMap();
+		parents = new Pair<Nodeid,Nodeid>(Nodeid.NULL, Nodeid.NULL);
 		if (canonicalPathRewrite != null) {
 			canonical2dirstateName = new HashMap<Path,Path>();
 		} else {