Mercurial > jhg

changeset 191:b777502a06f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not assume second parent can be set only when first one is set, again
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Thu, 14 Apr 2011 19:53:31 +0200
parents 9b99d27aeddc
children e5407b5a586a
files src/org/tmatesoft/hg/repo/Revlog.java
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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;
 		}