From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6967 invoked by alias); 19 Jun 2008 13:31:01 -0000 Received: (qmail 6958 invoked by uid 22791); 19 Jun 2008 13:31:00 -0000 X-Spam-Status: No, hits=-2.7 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org (qpsmtpd/0.31) with ESMTP; Thu, 19 Jun 2008 13:30:38 +0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id m5JDUZbb029003; Thu, 19 Jun 2008 09:30:35 -0400 Received: from file.rdu.redhat.com (file.rdu.redhat.com [10.11.255.147]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m5JDUYjK006105; Thu, 19 Jun 2008 09:30:34 -0400 Received: from [10.11.14.203] (vpn-14-203.rdu.redhat.com [10.11.14.203]) by file.rdu.redhat.com (8.13.1/8.13.1) with ESMTP id m5JDUXQc027301; Thu, 19 Jun 2008 09:30:34 -0400 Subject: Re: reorder patches From: Tim Waugh To: Jack Andrews Cc: patchutils-list@sourceware.org In-Reply-To: <2cf50a010806190627r3e9589dft2b96b9fdd91f57c9@mail.gmail.com> References: <2cf50a010806190612t87a1638v48cd56fc28596cba@mail.gmail.com> <1213881536.4212.4.camel@cyberelk.elk> <2cf50a010806190627r3e9589dft2b96b9fdd91f57c9@mail.gmail.com> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-JRM2x07mfuSHGORqPOLj" Organization: Red Hat: Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903. Date: Thu, 19 Jun 2008 13:31:00 -0000 Message-Id: <1213882233.4212.7.camel@cyberelk.elk> Mime-Version: 1.0 X-Mailer: Evolution 2.12.3 (2.12.3-5.fc8) X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 X-Virus-Checked: Checked by ClamAV on sourceware.org X-IsSubscribed: yes Mailing-List: contact patchutils-list-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: patchutils-list-owner@sourceware.org X-SW-Source: 2008-q2/txt/msg00007.txt.bz2 --=-JRM2x07mfuSHGORqPOLj Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Content-length: 334 On Thu, 2008-06-19 at 23:27 +1000, Jack Andrews wrote: > is it solved in the case i have the base source as well as the patches? Certainly 'git rebase -i' seems to manage it quite well for git repositories. It is more sophisticated in that it allows several different types of 'merge driver' to help with merge conflicts. Tim. */ --=-JRM2x07mfuSHGORqPOLj Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part Content-length: 189 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) iD8DBQBIWl92aSWRox63mSMRAk0FAKCgeYIZa8/BHIuPQiyEUx4PHEGLqQCeLH6w X/Q+B46ELRWIP4UPIF37kY4= =SeFH -----END PGP SIGNATURE----- --=-JRM2x07mfuSHGORqPOLj--