Mercurial > jhg

comparison src/org/tmatesoft/hg/internal/FileAnnotation.java @ 560:52263817b998

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Exception when no blocks from merged revision were reported and merge parent was not recorded for future use
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Tue, 26 Feb 2013 21:06:43 +0100
parents 154718ae23ed
children 6fbca6506bb5
comparison
equal deleted inserted replaced
559:6ca3d0c5b4bc 560:52263817b998
108 if (activeEqualsComesFromMerge) { 108 if (activeEqualsComesFromMerge) {
109 mergedRanges.put(rd.originChangesetIndex(), v); 109 mergedRanges.put(rd.originChangesetIndex(), v);
110 } else { 110 } else {
111 equalRanges.put(rd.originChangesetIndex(), v); 111 equalRanges.put(rd.originChangesetIndex(), v);
112 } 112 }
113 if (rd.isMerge() && !mergedRanges.containsKey(rd.mergeChangesetIndex())) {
114 // seen merge, but no lines were merged from p2.
115 // Add empty range to avoid uncertainty when a parent of p2 pops in
116 mergedRanges.put(rd.mergeChangesetIndex(), new RangeSeq());
117 }
113 intermediateEquals.clear(); 118 intermediateEquals.clear();
114 activeEquals = null; 119 activeEquals = null;
115 activeEqualsComesFromMerge = false; 120 activeEqualsComesFromMerge = false;
116 revisionDescriptor = null; 121 revisionDescriptor = null;
117 } 122 }