# HG changeset patch
# User Artem Tikhomirov <tikhomirov.artem@gmail.com>
# Date 1361909203 -3600
# Node ID 52263817b99806e54ef2c09b39fa81366b94808b
# Parent  6ca3d0c5b4bc64ec66f723a255fa87133c8a026e
Exception when no blocks from merged revision were reported and merge parent was not recorded for future use

diff -r 6ca3d0c5b4bc -r 52263817b998 src/org/tmatesoft/hg/internal/FileAnnotation.java
--- a/src/org/tmatesoft/hg/internal/FileAnnotation.java	Mon Feb 25 19:48:20 2013 +0100
+++ b/src/org/tmatesoft/hg/internal/FileAnnotation.java	Tue Feb 26 21:06:43 2013 +0100
@@ -110,6 +110,11 @@
 		} else {
 			equalRanges.put(rd.originChangesetIndex(), v);
 		}
+		if (rd.isMerge() && !mergedRanges.containsKey(rd.mergeChangesetIndex())) {
+			// seen merge, but no lines were merged from p2.
+			// Add empty range to avoid uncertainty when a parent of p2 pops in
+			mergedRanges.put(rd.mergeChangesetIndex(), new RangeSeq());
+		}
 		intermediateEquals.clear();
 		activeEquals = null;
 		activeEqualsComesFromMerge = false;