Mercurial > hg4j
diff src/org/tmatesoft/hg/internal/diff/ForwardAnnotateInspector.java @ 709:497e697636fc
Report merged lines as changed block if possible, not as a sequence of added/deleted blocks. To facilitate access to merge parent lines AddBlock got mergeLineAt() method that reports index of the line in the second parent (if any), while insertedAt() has been changed to report index in the first parent always
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Wed, 21 Aug 2013 16:23:27 +0200 |
parents | 7839ff0bfd78 |
children |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/internal/diff/ForwardAnnotateInspector.java Tue Aug 20 18:41:34 2013 +0200 +++ b/src/org/tmatesoft/hg/internal/diff/ForwardAnnotateInspector.java Wed Aug 21 16:23:27 2013 +0200 @@ -92,7 +92,8 @@ public void added(AddBlock block) throws HgCallbackTargetException { if (revDescriptor.isMerge() && block.originChangesetIndex() == revDescriptor.mergeChangesetIndex()) { - copyBlock(block.originChangesetIndex(), block.insertedAt(), block.totalAddedLines()); + assert block.mergeLineAt() != -1; + copyBlock(block.originChangesetIndex(), block.mergeLineAt(), block.totalAddedLines()); return; } BlockData addedLines = block.addedLines();