From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Lyotq-0006kM-5W
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 11:07:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Lyotl-0006jH-44
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 11:07:09 -0400
Received: from [199.232.76.173] (port=33224 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Lyotl-0006jE-0P
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 11:07:05 -0400
Received: from ecfrec.frec.bull.fr ([129.183.4.8]:59984)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <Laurent.Vivier@bull.net>) id 1Lyotk-0006uw-Gv
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 11:07:04 -0400
Subject: Re: [Qemu-devel] updating git tree
From: Laurent Vivier <Laurent.Vivier@bull.net>
In-Reply-To: <49F70B6A.8050809@redhat.com>
References: <1340785513-BeMail@laptop>  <49F70B6A.8050809@redhat.com>
Content-Type: text/plain; charset=utf-8
Date: Tue, 28 Apr 2009 17:10:42 +0200
Message-Id: <1240931442.4655.12.camel@frecb07144>
Mime-Version: 1.0
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: Kevin Wolf <kwolf@redhat.com>
Cc: laurent.desnogues@gmail.com, Christoph.Egger@amd.com, =?ISO-8859-1?Q?Fran=E7ois?= Revol <revol@free.fr>, computers57@hotmail.com, qemu-devel@nongnu.org

Le mardi 28 avril 2009 =C3=A0 15:58 +0200, Kevin Wolf a =C3=A9crit :
> Fran=C3=A7ois Revol schrieb:
> >>> Ah, of course, and I don't have the disk space to upgrade from etch=
=20
> >>> to=20
> >>> lenny...
> >>> fun.
> >>>
> >>> I think I'll just send the diffs from the last svn and be done with=
=20
> >>> it.
> >> you can use:
> >>
> >> git diff > tmp.patch
> >> patch -R -p1 < tmp.patch
> >> git pull
> >> patch -p1 < tmp.patch
> >=20
> > Ok this seems to work at least for now, I've put it in a script like
> >=20
> > #!/bin/sh
> > git diff > tmp.patch && patch -R -p1 < tmp.patch && git pull && patch=
 -
> > p1 < tmp.patch && rm tmp.patch
> >=20
> > Seems there is a git-revert, not sure how to use it anyway...
> > Oh well...
>=20
> git revert is for reverting commits. You can use git reset --hard
> instead of the patch -R though.

No, you can't:

"git diff" will create patch for only already existing files in the git
repository, so "patch -R" will not remove new files whereas "git reset
--hard" will remove them.

Regards,
Laurent
--=20
------------------ Laurent.Vivier@bull.net  ------------------
"Tout ce qui est impossible reste =C3=A0 accomplir"    Jules Verne
"Things are only impossible until they're not" Jean-Luc Picard