From: Pierre Habouzit <madcoder@debian.org>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] parse-opt: migrate fmt-merge-msg.
Date: Tue, 30 Sep 2008 23:16:45 +0200 [thread overview]
Message-ID: <20080930211643.GA16879@artemis.corp> (raw)
In-Reply-To: <20080930191014.GH21310@spearce.org>
[-- Attachment #1: Type: text/plain, Size: 1829 bytes --]
On Tue, Sep 30, 2008 at 07:10:14PM +0000, Shawn O. Pearce wrote:
> Pierre Habouzit <madcoder@debian.org> wrote:
> > On Mon, Sep 29, 2008 at 04:35:23PM +0000, Shawn O. Pearce wrote:
> > > Pierre Habouzit <madcoder@debian.org> wrote:
> > > > Also fix an inefficient printf("%s", ...) where we can use write_in_full.
> > >
> > > Near as I can tell, this is based upon a merge commit in next.
> >
> > Hmm I've always sent my patches this way, and I believe you can git am
> > -3 them on top of master easily. I can send you the updated series if
> > you want.
>
> I'd appreciate an updated series if you can send it. am -3 isn't
> "easily" applying it. Here I define "easy" as "the patch applies
> without me needing to resolve conflicts":
>
> $ git co -b ph/parseopt master
> $ git am -3 -s X
> Applying: parse-opt: migrate fmt-merge-msg.
> error: patch failed: builtin-fmt-merge-msg.c:5
> error: builtin-fmt-merge-msg.c: patch does not apply
> Using index info to reconstruct a base tree...
> Falling back to patching base and 3-way merge...
> CONFLICT (content): Merge conflict in builtin-fmt-merge-msg.c
> Recorded preimage for 'builtin-fmt-merge-msg.c'
> Failed to merge in the changes.
> Patch failed at 0001.
> When you have resolved this problem run "git am -3 --resolved".
> If you would prefer to skip this patch, instead run "git am -3 --skip".
> To restore the original branch and stop patching run "git am -3 --abort".
Okay, I will then, but FWIW it means that when you'll try to merge this
in next it'll conflict at that time, so I'm not sure there's a huge win
for you at that point.
--
·O· Pierre Habouzit
··O madcoder@debian.org
OOO http://www.madism.org
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2008-09-30 21:18 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-28 9:45 small warm-up: easy parse-opt migrations Pierre Habouzit
2008-09-28 9:45 ` [PATCH] parse-opt: migrate fmt-merge-msg Pierre Habouzit
2008-09-28 9:45 ` [PATCH] parse-opt: migrate git-merge-base Pierre Habouzit
2008-09-28 9:45 ` [PATCH] parse-opt: migrate builtin-merge-file Pierre Habouzit
2008-09-29 16:35 ` [PATCH] parse-opt: migrate fmt-merge-msg Shawn O. Pearce
2008-09-30 8:40 ` Pierre Habouzit
2008-09-30 19:10 ` Shawn O. Pearce
2008-09-30 21:16 ` Pierre Habouzit [this message]
2008-09-30 22:46 ` Shawn O. Pearce
2008-10-01 6:05 ` [PATCH 1/3] " Pierre Habouzit
2008-10-01 6:05 ` [PATCH 2/3] parse-opt: migrate git-merge-base Pierre Habouzit
2008-10-01 6:05 ` [PATCH 3/3] parse-opt: migrate builtin-merge-file Pierre Habouzit
2008-10-01 15:01 ` Shawn O. Pearce
2008-10-01 14:56 ` [PATCH 1/3] parse-opt: migrate fmt-merge-msg Shawn O. Pearce
2008-10-02 11:51 ` Pierre Habouzit
2008-10-02 12:59 ` [RESEND PATCH] " Pierre Habouzit
2008-10-02 12:59 ` [PATCH] parse-opt: migrate git-merge-base Pierre Habouzit
2008-10-02 12:59 ` [RESEND PATCH] parse-opt: migrate builtin-merge-file Pierre Habouzit
2008-09-28 13:20 ` small warm-up: easy parse-opt migrations Sverre Rabbelier
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=20080930211643.GA16879@artemis.corp \
--to=madcoder@debian.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=spearce@spearce.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;
as well as URLs for NNTP newsgroup(s).