public inbox for gentoo-catalyst@lists.gentoo.org
 help / color / mirror / Atom feed
From: Brian Dolbec <dolsen@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Subject: Re: [gentoo-catalyst] [PATCH 1/4] Initial rearrangement of the python directories
Date: Sat, 14 Dec 2013 08:42:36 -0800	[thread overview]
Message-ID: <1387039356.3897.164.camel@big_daddy.dol-sen.ca> (raw)
In-Reply-To: <44746063.ZggCSZXDZz@moiraine>

[-- Attachment #1: Type: text/plain, Size: 518 bytes --]

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 
> 2.0.13?
> 

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.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 620 bytes --]

  reply	other threads:[~2013-12-14 16:42 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-14  3:20 [gentoo-catalyst] rewrite-on-master patches, round-2 Brian Dolbec
2013-12-14  3:20 ` [gentoo-catalyst] [PATCH 1/4] Initial rearrangement of the python directories Brian Dolbec
2013-12-14  5:22   ` Matt Turner
2013-12-14  5:48     ` W. Trevor King
2013-12-14 12:12     ` Brian Dolbec
2013-12-14 14:17   ` Dylan Baker
2013-12-14 16:42     ` Brian Dolbec [this message]
2013-12-14 23:57     ` W. Trevor King
2013-12-14  3:20 ` [gentoo-catalyst] [PATCH 2/4] move catalyst_support, builder, catalyst_lock out of modules, into the catalyst's base namespace Brian Dolbec
2013-12-14  3:20 ` [gentoo-catalyst] [PATCH 3/4] rename the modules subpkg to targets, it better reflects what it contains Brian Dolbec
2013-12-14  3:20 ` [gentoo-catalyst] [PATCH 4/4] rename files directory to etc to better reflect the directories contents Brian Dolbec
2013-12-15  4:39   ` W. Trevor King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1387039356.3897.164.camel@big_daddy.dol-sen.ca \
    --to=dolsen@gentoo.org \
    --cc=gentoo-catalyst@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox