All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Luck, Tony" <tony.luck@intel.com>
To: linux-ia64@vger.kernel.org
Subject: 2.5 bk tree broken?
Date: Mon, 23 Jun 2003 22:43:05 +0000	[thread overview]
Message-ID: <marc-linux-ia64-105640820432133@msgid-missing> (raw)

I did a "bk pull" from

http://lia64.bkbits.net:8080/linux-ia64-2.5

a few minutes ago, and was surprised when BitKeeper
complained about lots of merge collisions (the bk tree
into which I pulled hasn't even had a "bk edit" run in
it, let alone any changes checked in).

Since I'm a neophyte at BK, I tried my usual fix (remove
the whole tree, and run "bk clone" again).  This succeeded
without any reported errors, but time seems to have gone
backwards. The tree I now see is missing some stuff that
was checked into 2.5.72 (e.g fixes to include/asm-ia64/mca.h
and arch/ia64/kernel/mca.h for cleaner handling of INIT
events).

The Web interface to BK says the newest changeset in this
tree was applied 5 weeks ago.

-Tony

             reply	other threads:[~2003-06-23 22:43 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-06-23 22:43 Luck, Tony [this message]
2003-06-23 22:52 ` 2.5 bk tree broken? David Mosberger
2003-06-23 23:09 ` David Mosberger

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=marc-linux-ia64-105640820432133@msgid-missing \
    --to=tony.luck@intel.com \
    --cc=linux-ia64@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 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.