public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Paul Jackson <pj@sgi.com>
To: Andreas Gruenbacher <agruen@suse.de>
Cc: akpm@osdl.org, linux-kernel@vger.kernel.org
Subject: Re: Inclusion of UML in 2.6.8
Date: Sun, 27 Jun 2004 16:43:32 -0700	[thread overview]
Message-ID: <20040627164332.6c86ccd2.pj@sgi.com> (raw)
In-Reply-To: <1088344199.21940.62.camel@winden.suse.de>

> forgetting to add a file to a patch before modifying it is painful.

Yup.

One can dig ones way out by (1) copying the new code aside, (2)
unwinding until you can forcibly pop (or bk co) the pristine source
back, (3) push'ing back to the desired patch, (4) 'q edit' and copy over
the new code.  But this is a "learned" response.

> I do not have a good idea how to fix this in a more satisfactory way.

Me neither.

-- 
                          I won't rest till it's the best ...
                          Programmer, Linux Scalability
                          Paul Jackson <pj@sgi.com> 1.650.933.1373

  reply	other threads:[~2004-06-27 23:43 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-06-26 17:05 Inclusion of UML in 2.6.8 BlaisorBlade
2004-06-26 18:10 ` Christoph Hellwig
2004-06-27  3:53   ` Jeff Dike
2004-06-27 13:57     ` Rik van Riel
2004-06-28 10:55       ` Arnd Bergmann
2004-06-29 19:29     ` Uploaded Uml patchset for 2.6.7(was: Re: Inclusion of UML in 2.6.8) BlaisorBlade
2004-07-03 18:25       ` [uml-devel] " BlaisorBlade
2004-06-26 20:09 ` Inclusion of UML in 2.6.8 Andrew Morton
2004-06-27  3:59   ` Jeff Dike
2004-06-27  6:32     ` Paul Jackson
2004-06-27  6:40       ` Andrew Morton
2004-06-27  8:08         ` Paul Jackson
2004-06-27 13:50         ` Andreas Gruenbacher
2004-06-27 23:43           ` Paul Jackson [this message]
2004-06-28 21:18         ` David Eger
2004-06-27  8:53       ` Geert Uytterhoeven
     [not found]         ` <20040628181134.GA21360@havoc.gtf.org>
     [not found]           ` <Pine.GSO.4.58.0407201754460.23496@waterleaf.sonytel.be>
2004-07-22 13:09             ` [PATCH] cirrusfb: update for amiga (zorro) David Eger

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=20040627164332.6c86ccd2.pj@sgi.com \
    --to=pj@sgi.com \
    --cc=agruen@suse.de \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.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