From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LyuQj-0008C3-CP
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 17:01:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LyuQe-0008Br-Nn
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 17:01:28 -0400
Received: from [199.232.76.173] (port=38058 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LyuQe-0008Bo-Kr
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 17:01:24 -0400
Received: from smtp5-g21.free.fr ([212.27.42.5]:55211)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <revol@free.fr>) id 1LyuQd-0004JO-28
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 17:01:24 -0400
In-Reply-To: <11194473229-BeMail@laptop>
Subject: Re: [Qemu-devel] updating git tree
From: "=?utf-8?q?Fran=C3=A7ois?= Revol" <revol@free.fr>
Date: Tue, 28 Apr 2009 23:01:36 +0200 CEST
Message-Id: <13850618085-BeMail@laptop>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: =?utf-8?q?Fran=C3=A7ois?= Revol <revol@free.fr>
Cc: andreas.faerber@web.de, qemu-devel@nongnu.org

> > 
> > To commit individual files, use `git add file1.c`, then `git 
> > commit`  
> > without -a.
> > You can check `git status` for what'll get committed.
> 
> That I guessed, but there is no way to forbid commiting deleted files 
> at once...
> 

So here is what I've did, FWIW:

svn diff > svn-popenaudio.diff
svn diff > svn-hid.diff
# vi both to only keep related changes
cd ..

git clone ...

git apply -p0 < ../svn-hid.diff
git rm hw/usb-wacom.c
git commit -a -m "Merge usb-wacom.c into usb-hid.c"
# argh, git status sayw hw/usb-wacom.c is still here... 
rm hw/usb-wacom.c

# generate a diff...
git-format-patch -s origin
# of course it outputs a stupid mbox format which isn't used everywhere
# so I must strip the headers if I just need the real patch 
(overengineering)
for f in 0=3F=3F=3F-*; do sed '1,/^$/d' -i "$f"; done

git apply -p0 < ../svn-popenaudio.diff
# now I should probably finish it first as I don't know how to generate 
a single merged patch from multiple commits...
#git add audio/popenaudio.c
#git commit -a -m "Start of popen(3) audio output"

Fran=C3=A7ois.