Re: [Qemu-devel] [PATCH v2 00/40] Split up the trace-events file

[Daniel P. Berrange]

On Thu, Jun 16, 2016 at 02:00:54PM +0100, Peter Maydell wrote:
> On 16 June 2016 at 09:39, Daniel P. Berrange <address@hidden> wrote:
> > This series splits up trace-events so that there is
> > one trace-events file per sub-directory that has
> > tracing events defined. This means that the trace-events
> > files now get assoociated with the subsystem maintainers
> > if you run get_maintainer.pl on a patch. It also means
> > that responsibility for resolving conflicts is now
> > delegated to subsystem maintainers, and overall such
> > conflicts should be much rarer.
> 
> Do you have a command line rune to sanity check that the
> split files have identical content to the old single file?
> That would be handy when it comes to merging this into master
> to check that any conflicts got resolved correctly.

Sure, this is what I used to check we didn't loose anything:


$ git checkout master
perl  -e 'while (<>) { next if /^\s*$/; next if /^\s*#/; print }' trace-events 
| sort > old.txt

$ git checkout trace-events
perl  -e 'while (<>) { next if /^\s*$/; next if /^\s*#/; print }' `find -name 
trace-events` | sort > new.txt

$ diff old.txt new.txt

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|