# HG changeset patch
# User Artem Tikhomirov <tikhomirov.artem@gmail.com>
# Date 1302696913 -7200
# Node ID 9807bf8f3a9c6194875080a3a8a31d3c978a6bfa
# Parent  f26ffe04ced09a79d5604d3674925fe4c667e329
Do not assume second parent can be set only when first one is set

diff -r f26ffe04ced0 -r 9807bf8f3a9c src/org/tmatesoft/hg/repo/Revlog.java
--- a/src/org/tmatesoft/hg/repo/Revlog.java	Tue Apr 12 19:36:18 2011 +0200
+++ b/src/org/tmatesoft/hg/repo/Revlog.java	Wed Apr 13 14:15:13 2011 +0200
@@ -230,9 +230,9 @@
 					allNodes.add(nid);
 					if (parent1Revision != -1) {
 						firstParent.put(nid, sequentialRevisionNodeids[parent1Revision]);
-						if (parent2Revision != -1) {
-							secondParent.put(nid, sequentialRevisionNodeids[parent2Revision]);
-						}
+					}
+					if (parent2Revision != -1) { // revlog of DataAccess.java has p2 set when p1 is -1  
+						secondParent.put(nid, sequentialRevisionNodeids[parent2Revision]);
 					}
 				}
 			};