# HG changeset patch
# User Artem Tikhomirov <tikhomirov.artem@gmail.com>
# Date 1302803611 -7200
# Node ID b777502a06f59d8850ea14c6387eed61335fd20c
# Parent  9b99d27aeddc3d516b26f7fccb0b306edc55a7f1
Do not assume second parent can be set only when first one is set, again

diff -r 9b99d27aeddc -r b777502a06f5 src/org/tmatesoft/hg/repo/Revlog.java
--- a/src/org/tmatesoft/hg/repo/Revlog.java	Thu Apr 14 02:48:06 2011 +0200
+++ b/src/org/tmatesoft/hg/repo/Revlog.java	Thu Apr 14 19:53:31 2011 +0200
@@ -273,10 +273,10 @@
 			boolean modified = false;
 			if (p1 != null) {
 				modified = c.add(p1);
-				Nodeid p2 = secondParent(nid);
-				if (p2 != null) {
-					modified = c.add(p2) || modified;
-				}
+			}
+			Nodeid p2 = secondParent(nid);
+			if (p2 != null) {
+				modified = c.add(p2) || modified;
 			}
 			return modified;
 		}