Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Simon Marchi <simon.marchi@polymtl.ca>
To: Weimin Pan <weimin.pan@oracle.com>
Cc: Simon Marchi <simon.marchi@ericsson.com>, gdb-patches@sourceware.org
Subject: Re: [PATCH v2 PR gdb/16841] virtual inheritance via typedef cannot find base
Date: Sat, 08 Sep 2018 08:51:00 -0000	[thread overview]
Message-ID: <47401603e039c431cf061c7dc354ce7a@polymtl.ca> (raw)
In-Reply-To: <4864ea95-37cc-a323-c330-7d87aee92dde@oracle.com>

On 2018-09-08 01:12, Weimin Pan wrote:
>> Your patch still has trailing whitespaces.  Try to do:
>> 
>> $ git format-patch HEAD^
>> $ git am 0001-virtual-inheritance-via-typedef-cannot-find-base.patch
>> 
>> and make sure you have no message other than
>> 
>>    Applying: virtual inheritance via typedef cannot find base
> 
> It's nice to know this "git am" command. Do I use the "git am --abort"
> command to
> restore my original patch, correct problems, then use another "git am" 
> command?

You shouldn't need to use --abort in this case... In my instructions, I 
forgot to mention to remove your commit before applying it again (it's 
expected that applying the same patch twice doesn't work).  So it should 
be:

$ git format-patch HEAD^
$ git reset --hard HEAD^
$ git am 0001-virtual-inheritance-via-typedef-cannot-find-base.patch

Modifications to the patch can be done by using "git commit --amend", as 
usual.

Thanks!

Simon


  reply	other threads:[~2018-09-08  8:51 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-24  0:21 Weimin Pan
2018-09-07 21:26 ` Simon Marchi
2018-09-07 22:04   ` Simon Marchi
2018-09-08  0:12   ` Weimin Pan
2018-09-08  8:51     ` Simon Marchi [this message]
2018-09-07 21:42 ` Tom Tromey
2018-09-08  0:19   ` Weimin Pan

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=47401603e039c431cf061c7dc354ce7a@polymtl.ca \
    --to=simon.marchi@polymtl.ca \
    --cc=gdb-patches@sourceware.org \
    --cc=simon.marchi@ericsson.com \
    --cc=weimin.pan@oracle.com \
    /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