From: Linus Torvalds <torvalds@transmeta.com>
To: Vojtech Pavlik <vojtech@suse.cz>
Cc: Greg KH <greg@kroah.com>, <linux-kernel@vger.kernel.org>,
<linuxconsole-dev@lists.sourceforge.net>
Subject: Re: [patch] Input cleanups for 2.5.29 [2/2]
Date: Tue, 30 Jul 2002 14:46:12 -0700 (PDT) [thread overview]
Message-ID: <Pine.LNX.4.33.0207301441050.2051-100000@penguin.transmeta.com> (raw)
In-Reply-To: <20020730233542.A23181@ucw.cz>
On Tue, 30 Jul 2002, Vojtech Pavlik wrote:
>
> Now the question remaining is how to fix that? You can just skip the
> patch. I've tried a 'bk undo', but that complains about unmerged leaves
> in that case (though really nothing depends on those changes). Or should
> I just make another cset on top of all the previous?
Ugh. there's a few things you can do
- I often actually do a "bk undo -axxx" and then just re-do the parts I
want to re-do.
NOTE! This only works if you haven't already had people pull from your
repository (or you'll need to ask them to do the "bk undo" as well).
- You can reverse the cset, which means that it's still there, but there
is also a cset that says "undo that other cset". I prefer to not pull
those kinds of undo's, but they do happen, and I occasionally do them
myself. I try to avoid it, but it's very useful for debugging ("does
that problem go away if I undo just that one cset?"), and sometimes
it _is_ the sanest way to go.
So do "bk cset -xA.BBB"
- in this case, maybe just adding a new cset is the proper thing.
Especially as reversing the cset doesn't actually get you where you
want anyway, since you'd still have to do the "unsigned short" -> "u16"
translation as yet another cset.
I only get upset if the tree looks _really_ cluttered, in which case I may
ask you to re-do it (that's happened once with the reiserfs tree).
Linus
next prev parent reply other threads:[~2002-07-30 21:43 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-07-30 10:26 [patch] Small input fixes for 2.5.29 [1/2] Vojtech Pavlik
2002-07-30 10:29 ` [patch] Small input fixes for 2.5.29 [2/2] Vojtech Pavlik
2002-07-30 13:22 ` [patch] Input cleanups for 2.5.29 [1/2] Vojtech Pavlik
2002-07-30 13:23 ` [patch] Input cleanups for 2.5.29 [2/2] Vojtech Pavlik
2002-07-30 20:17 ` [patch] Fix suspend of the kseriod thread Vojtech Pavlik
2002-07-30 20:18 ` [patch] Remove superfluous code that snuck back in PPC merge Vojtech Pavlik
2002-07-30 21:57 ` [patch] Fix suspend of the kseriod thread Russell King
2002-07-30 22:00 ` Vojtech Pavlik
2002-07-31 9:55 ` David Woodhouse
2002-07-31 9:58 ` Vojtech Pavlik
2002-07-31 10:07 ` David Woodhouse
2002-07-31 10:10 ` Vojtech Pavlik
2002-07-31 11:44 ` sleep_on() DIE DIE DIE (was Re: [patch] Fix suspend of the kseriod thread) David Woodhouse
2002-07-30 21:09 ` [patch] Input cleanups for 2.5.29 [2/2] Greg KH
2002-07-30 21:20 ` Linus Torvalds
2002-07-30 21:35 ` Vojtech Pavlik
2002-07-30 21:46 ` Linus Torvalds [this message]
2002-07-30 22:02 ` Vojtech Pavlik
2002-07-30 21:38 ` Brad Hards
2002-07-30 21:26 ` Brad Hards
2002-07-30 21:35 ` Linus Torvalds
2002-07-30 21:42 ` Alexander Viro
2002-07-30 21:47 ` Brad Hards
2002-07-30 22:02 ` Alexander Viro
2002-07-30 22:05 ` Alexander Viro
2002-08-01 10:49 ` Pavel Machek
2002-08-01 12:17 ` Sean Neakums
2002-07-30 22:04 ` Linus Torvalds
2002-07-30 21:55 ` Ben Pfaff
2002-07-30 22:03 ` Alexander Viro
2002-07-31 13:42 ` Alan Cox
2002-07-31 12:57 ` Andreas Schwab
2002-07-31 14:01 ` extended integer types (was Re: [patch] Input cleanups for 2.5.29 [2/2]) Bill Rugolsky Jr.
2002-07-30 21:39 ` [patch] Input cleanups for 2.5.29 [2/2] Vojtech Pavlik
2002-07-30 22:46 ` Kai Henningsen
2002-07-30 21:45 ` Jeff Garzik
2002-07-30 21:59 ` Linus Torvalds
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=Pine.LNX.4.33.0207301441050.2051-100000@penguin.transmeta.com \
--to=torvalds@transmeta.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxconsole-dev@lists.sourceforge.net \
--cc=vojtech@suse.cz \
/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).