From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LyngY-0004cx-AT
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 09:49:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LyngS-0004cD-Um
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 09:49:21 -0400
Received: from [199.232.76.173] (port=38279 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LyngS-0004cA-Nj
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 09:49:16 -0400
Received: from smtp3-g21.free.fr ([212.27.42.3]:37814)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <revol@free.fr>) id 1LyngR-00040C-Sl
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 09:49:16 -0400
In-Reply-To: <1240924206.4655.9.camel@frecb07144>
Subject: Re: [Qemu-devel] updating git tree
From: "=?utf-8?q?Fran=C3=A7ois?= Revol" <revol@free.fr>
Date: Tue, 28 Apr 2009 15:49:26 +0200 CEST
Message-Id: <1340785513-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: Laurent Vivier <Laurent.Vivier@bull.net>
Cc: laurent.desnogues@gmail.com, Christoph.Egger@amd.com, computers57@hotmail.com, qemu-devel@nongnu.org

> > Ah, of course, and I don't have the disk space to upgrade from etch 
> > to 
> > lenny...
> > fun.
> > 
> > I think I'll just send the diffs from the last svn and be done with 
> > it.
> 
> you can use:
> 
> git diff > tmp.patch
> patch -R -p1 < tmp.patch
> git pull
> patch -p1 < tmp.patch

Ok this seems to work at least for now, I've put it in a script like

#!/bin/sh
git diff > tmp.patch && patch -R -p1 < tmp.patch && git pull && patch -
p1 < tmp.patch && rm tmp.patch

Seems there is a git-revert, not sure how to use it anyway...
Oh well...

Thanks.

Fran=C3=A7ois.
todo +=3D "learn git";
freetime -=3D "many days";