From: Kent Borg <kentborg@borg.org>
To: Tom Rini <trini@kernel.crashing.org>
Cc: linuxppc-embedded@lists.linuxppc.org
Subject: Re: BK to CVS?
Date: Fri, 5 Oct 2001 11:11:45 -0400 [thread overview]
Message-ID: <20011005111145.C8157@borg.org> (raw)
In-Reply-To: <20011004132953.B32269@cpe-24-221-152-185.az.sprintbbd.net>; from trini@kernel.crashing.org on Thu, Oct 04, 2001 at 01:29:53PM -0700
Progress. I am telling cvs a "-ko" to keep keyword expansions as they
come in.
But I am still tripping over something that I either don't understand
in Bitkeeper, or Bitkeeper is misbehaving. The following doesn't do
what I expect.
I started things up by doing:
- "bk clone", then
- "bk changes" to see what the most recent revision is, then
- a complete export of that rev, and put that in cvs as my starting
point.
Then each day I have a script that does:
- "bk changes" to see the "before" rev,
- "bk pull" to get up to date,
- "bk changes" to see "after" rev,
- export of a patch between those two revs, apply that to my cvs.
The problem is that some of the patches fail because the cvs file
isn't in the state the patch expects. Because I am still getting the
bugs out, we aren't doing any work in the cvs tree, only bk stuff is
going in there.
I did a new export from bk as of the latest "bk changes" rev and
compared that with an export from cvs. (The idea being that beginning
dump + delta + delta + delta should equal ending dump.) Yes, I get
some BK Id collisions that don't bother my daily patches, but I also
get a couple more files with substantial differences. Is there
something wrong with my method? Is there a likely problem with my
implementation? Is Bitkeeper being buggy?
Thanks,
-kb, the Kent who is convinced he is getting close and so should soon
quit asking these annoying questions.
** Sent via the linuxppc-embedded mail list. See http://lists.linuxppc.org/
next prev parent reply other threads:[~2001-10-05 15:11 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2001-10-03 17:05 BK to CVS? Kent Borg
2001-10-03 18:32 ` Tom Rini
2001-10-04 13:25 ` Kent Borg
2001-10-04 20:29 ` Tom Rini
2001-10-05 15:11 ` Kent Borg [this message]
2001-10-05 15:48 ` Andrew Johnson
2001-10-05 16:04 ` Ricardo Scop
2001-10-06 2:25 ` Dan Malek
2001-10-05 20:52 ` BK to CVS? + MDIO Ricardo Scop
2001-10-06 3:34 ` Tom Rini
2001-10-06 3:42 ` Re[2]: " Ricardo Scop
2001-10-06 3:41 ` Dan Malek
2001-10-08 12:01 ` Jerry Van Baren
2001-10-08 13:06 ` Wolfgang Denk
2001-10-06 2:43 ` BK to CVS? Tom Rini
2001-10-05 16:23 ` Kent Borg
2001-10-05 16:42 ` Andrew Johnson
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=20011005111145.C8157@borg.org \
--to=kentborg@borg.org \
--cc=linuxppc-embedded@lists.linuxppc.org \
--cc=trini@kernel.crashing.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).