From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58810) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDX1l-0004I7-OS for qemu-devel@nongnu.org; Thu, 16 Jun 2016 09:08:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDX1g-0002mv-BY for qemu-devel@nongnu.org; Thu, 16 Jun 2016 09:08:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38905) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDX1g-0002mr-5L for qemu-devel@nongnu.org; Thu, 16 Jun 2016 09:08:04 -0400 Date: Thu, 16 Jun 2016 14:07:59 +0100 From: "Daniel P. Berrange" Message-ID: <20160616130759.GI11426@redhat.com> Reply-To: "Daniel P. Berrange" References: <1466066426-16657-1-git-send-email-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Subject: Re: [Qemu-devel] [PATCH v2 00/40] Split up the trace-events file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: QEMU Developers , Stefan Hajnoczi , Eric Blake , =?utf-8?B?TGx1w61z?= Vilanova , Gerd Hoffmann On Thu, Jun 16, 2016 at 02:00:54PM +0100, Peter Maydell wrote: > On 16 June 2016 at 09:39, Daniel P. Berrange 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 :|