# HG changeset patch
# User Artem Tikhomirov <tikhomirov.artem@gmail.com>
# Date 1297748436 -3600
# Node ID 26ad21b250e4dddec706dfe6f78abc4f06dc66a1
# Parent  cea84c5995e6e13a48686f2c029907240e3844d6
Explicit op to tell merge revisions

diff -r cea84c5995e6 -r 26ad21b250e4 src/org/tmatesoft/hg/core/Cset.java
--- a/src/org/tmatesoft/hg/core/Cset.java	Tue Feb 15 06:30:05 2011 +0100
+++ b/src/org/tmatesoft/hg/core/Cset.java	Tue Feb 15 06:40:36 2011 +0100
@@ -117,7 +117,9 @@
 		return deletedFiles;
 	}
 
-	// XXX do I need boolean isMergeRevision()?
+	public boolean isMerge() {
+		return !Nodeid.NULL.equals(getSecondParentRevision());
+	}
 	
 	public Nodeid getFirstParentRevision() {
 		// XXX may read once for both p1 and p2 
diff -r cea84c5995e6 -r 26ad21b250e4 src/org/tmatesoft/hg/core/Nodeid.java
--- a/src/org/tmatesoft/hg/core/Nodeid.java	Tue Feb 15 06:30:05 2011 +0100
+++ b/src/org/tmatesoft/hg/core/Nodeid.java	Tue Feb 15 06:40:36 2011 +0100
@@ -62,7 +62,7 @@
 	@Override
 	public boolean equals(Object o) {
 		if (o instanceof Nodeid) {
-			return Arrays.equals(this.binaryData, ((Nodeid) o).binaryData);
+			return this == o || equalsTo(((Nodeid) o).binaryData);
 		}
 		return false;
 	}