Re: [libvirt] [not libvirt PATCH] rcc - resolve capabilities conflicts

On Thu, Apr 12, 2018 at 09:45:32 +0200, Ján Tomko wrote: > my tool for naively resolving qemu capabilities conflicts after a > rebase, that used to contain my latest syntax-check addition > --- > rcc | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 62 insertions(+) > create mode 100755 rcc [...] > +while (<$status_fh>) { > + my ($flag, $filename) = split; > + if ($flag eq 'UU') { > + if ($filename =~ '^src/qemu/qemu_capabilities.[ch]$' or > + $filename =~ '^tests/qemucapabilitiesdata/caps.*xml') { > + say "Trying to fix $filename"; > + &union_merge($filename); > + $repo->command('add', $filename); > + } > + } > +} > +$repo->command_close_pipe($status_fh, $ctx); > +system('tests/group-qemu-caps.pl'); did you forget to attach this file? :)