From 28dc2231bf161b289c5b678603bba78e6b91c1a8 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 6 Jul 2019 20:56:07 +0100 Subject: [PATCH] Add more difference infrastructure; Check with Jira --- differences/dometahierarchy.groovy | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/differences/dometahierarchy.groovy b/differences/dometahierarchy.groovy index 3a2538e..a1ed656 100644 --- a/differences/dometahierarchy.groovy +++ b/differences/dometahierarchy.groovy @@ -192,6 +192,10 @@ class JiraTicketInfo { jiranumber = '' uri = '' } + + def String dump() { + return "jiranumber: ${jiranumber} uri: ${uri}" + } } def extractjiraticketinfo(String line) { @@ -522,10 +526,10 @@ def boolean report(meta, differencerecords, boolean iscomponent = true) { if (!merges.containsKey(dr.mergeinfo)) { m = new MergeReportRecord() m.comment = dr.mergeinfo - m.duplicate = 1 + m.duplicates = 1 } else { m = merges[dr.mergeinfo] - m.duplicate += 1 + m.duplicates += 1 } merges[dr.mergeinfo] = m }