From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Lz4cZ-0004Hd-Rn
	for qemu-devel@nongnu.org; Wed, 29 Apr 2009 03:54:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Lz4cV-0004EU-03
	for qemu-devel@nongnu.org; Wed, 29 Apr 2009 03:54:23 -0400
Received: from [199.232.76.173] (port=55326 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Lz4cU-0004ER-T4
	for qemu-devel@nongnu.org; Wed, 29 Apr 2009 03:54:18 -0400
Received: from mx2.redhat.com ([66.187.237.31]:38528)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <armbru@redhat.com>) id 1Lz4cU-0004zS-BD
	for qemu-devel@nongnu.org; Wed, 29 Apr 2009 03:54:18 -0400
Subject: Re: [Qemu-devel] updating git tree
References: <13850618085-BeMail@laptop>
From: Markus Armbruster <armbru@redhat.com>
Date: Wed, 29 Apr 2009 09:54:13 +0200
In-Reply-To: <13850618085-BeMail@laptop> (=?utf-8?Q?=22Fran=C3=A7ois?=
	Revol"'s message of "Tue\, 28 Apr 2009 23\:01\:36 +0200 CEST")
Message-ID: <87ljpjgaje.fsf@pike.pond.sub.org>
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

"Fran=C3=A7ois Revol" <revol@free.fr> writes:

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

There is.

git-commit by default commits exactly what you staged in the index.  If
you staged a delete, it'll commit a delete.  If you don't want that,
unstage it, say with git-add or git-reset.

git-commit can also bypass the index.  Just list the files you want to
commit.  If a listed file no longer exists, the commit will remove it.

> 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...=20
> 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=20
> (overengineering)

If you want a diff, use git-diff.

If you want e-mail ready for sending, use git-format-patch.

> for f in 0???-*; 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=20
> 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.

Me thinks you are still fighting the tool instead of working with it.
No happiness found down that way.