From: bame@riverrock.org
To: Matthew Wilcox <matthew@wil.cx>
Cc: parisc-linux@thepuffingroup.com
Subject: Re: linux bame
Date: Fri, 10 Nov 2000 08:57:47 -0700 [thread overview]
Message-ID: <m13uGYm-001Vp3C@chalet> (raw)
In-Reply-To: Your message of "Fri, 10 Nov 2000 09:49:07 GMT." <20001110094907.A11268@parcelfarce.linux.theplanet.co.uk>
= On Thu, Nov 09, 2000 at 03:53:48PM -0700, Paul Bame wrote:
= > Somebody never imported 2.4.0-test6, then I imported -test10 on the mai
n
= > vendor branch and now can't (easily) undo that to import test6 and THEN
= > test10. This workaround sucks.
=
= don't use vendor branches. didn't you talk to mang about this?
Um, I have no information to go on from your note. All the (successful)
merges I've done before have used the cookbook CVS merge method including
a vendor branch. Several (N-1?) of the palinux merges have been
accompanied by updating the vendor branch. And this merge is going
well despite the ugly workaround, or so it appears to me. Just
importing files to a vendor branch should have no effect on anything
else unless CVS has some horrible bug (RCS does not). Before I make
what is apparently a serious mistake ("don't use vendor branches" sounds
pretty serious) please enlighten me!
-P
next prev parent reply other threads:[~2000-11-10 15:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <200011092253.PAA14963@puffin.external.hp.com>
2000-11-10 9:49 ` linux bame Matthew Wilcox
2000-11-10 15:57 ` bame [this message]
2000-11-14 19:17 ` Michael Ang
2000-11-14 20:00 ` Paul Bame
2000-11-14 22:31 ` [parisc-linux] tracking third-party sources (was Re: linux bame) Michael Ang
[not found] <200101102108.OAA19847@puffin.external.hp.com>
2001-01-10 23:31 ` linux bame Matthew Wilcox
[not found] <200011012053.NAA15579@puffin.external.hp.com>
2000-11-02 0:13 ` Matthew Wilcox
2000-11-02 6:18 ` bame
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=m13uGYm-001Vp3C@chalet \
--to=bame@riverrock.org \
--cc=matthew@wil.cx \
--cc=parisc-linux@thepuffingroup.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.