From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D3614138247 for ; Sat, 14 Dec 2013 16:42:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 626F7E0AE4; Sat, 14 Dec 2013 16:42:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E03C9E0AE4 for ; Sat, 14 Dec 2013 16:42:48 +0000 (UTC) Received: from [192.168.1.210] (S010600222de111ff.vc.shawcable.net [96.49.5.156]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id 1E6BD33F54D for ; Sat, 14 Dec 2013 16:42:48 +0000 (UTC) Message-ID: <1387039356.3897.164.camel@big_daddy.dol-sen.ca> Subject: Re: [gentoo-catalyst] [PATCH 1/4] Initial rearrangement of the python directories From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org Date: Sat, 14 Dec 2013 08:42:36 -0800 In-Reply-To: <44746063.ZggCSZXDZz@moiraine> References: <1386991211-9296-1-git-send-email-dolsen@gentoo.org> <1386991211-9296-2-git-send-email-dolsen@gentoo.org> <44746063.ZggCSZXDZz@moiraine> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-VrW/LVfOIHTjJmekEQJj" X-Mailer: Evolution 3.6.4 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org Mime-Version: 1.0 X-Archives-Salt: 9ed1ccf1-ee36-4b40-9132-41e861b8ac7f X-Archives-Hash: 83eacc92b19e47d60c5583ee7f40bb1f --=-VrW/LVfOIHTjJmekEQJj Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, 2013-12-14 at 06:17 -0800, Dylan Baker wrote: > What sha does this apply against? It doesn't apply against master, 2.0.14= , or=20 > 2.0.13? >=20 It likely doesn't apply to current master as numerous other rebase errors have already been pointed out. This was the attempt to rebase a series of patches, many a year old now onto the current master which has had numerous conflicting commits. Plus numerous rebases for commit merges, splits, and re-ordering in an attempt appease previous patch reviews. --=-VrW/LVfOIHTjJmekEQJj Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQF8BAABCgBmBQJSrIp8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4Njg4RkQxQ0M3MUMxQzA0RUFFQTQyMzcy MjE0RDkwQTAxNEYxN0NCAAoJECIU2QoBTxfLVk4H/1EksjM3aNViAiGTlRU8CUoi zPN7Eob8PcFeV/NcK+HRtx3z3e3ciSqVAKSdVCCqE0lP+m5GGEI3DEzHG8oU+1kH mWKbKWOHLu0tyvptpN1Ox2P3nsuruC67oFxe2gvB5+iY2tlHDYT/NbHLv4+Qosqp BadF5rPAUM5W2N7F6Jkqm9JX9NVQmb/vkEi6uBT+CqfslEoDQxgYQkjjCPbKrOTy qEbNWntQkTL+P2rkIzZc8EXz73s1iUp10ylJcJRCUV2sxFmi4h9ySpNtfeGYkVL7 janlO07IWKtdXv4A2bG1MVqMqn2duYv1vt8KNodriEnHYchIi8R4l1FVFM/133o= =l7sq -----END PGP SIGNATURE----- --=-VrW/LVfOIHTjJmekEQJj--