RH-FMK / skt / 1202

67%

master: 66%

Pull #308

travis-ci

Support ordered mixture of merge arguments

The previous patch does not allow to mix of --merge-ref, --patch
and --pw options. However, this new patch supports ordered mixture
of merge arguments. The arguments for skt merge should now be used
multiple times, and the process of these merge is ordered.

The AppendMergeArgument class, a custom action, organizes the order
of merge arguments by merge_queue. Each element in merge_queue is
stored under ('merge arguments', 'merge content'). For each
iteration, it processes merge arguments by order until end of the
list merge_queue.

We use list idx as a counter merge patch for merge-ref, patch and
pw option respectively. We use previous_merge to keep track of
information of the previous merge to support the report_string.

Fixes #284

333 of 555 branches covered (60.0%)

Branch coverage included in aggregate %.

47 of 47 new or added lines in 1 file covered. (100.0%)

1020 of 1471 relevant lines covered (69.34%)

0.69 hits per line