public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: James Bottomley <James.Bottomley@steeleye.com>
To: lm@bitmover.com
Cc: linux-kernel@vger.kernel.org
Subject: Problems using new Linux-2.4 bitkeeper repository.
Date: Thu, 14 Mar 2002 21:38:16 -0500	[thread overview]
Message-ID: <200203150238.g2F2cGe21131@localhost.localdomain> (raw)

How do those of us who've been using the

http://gkernel.bitkeeper.net/marcelo-2.4

for development resync against the kernel24.bkbits.net tree?  It looks like 
the changes from 2.4.18-pre8 onwards all have different patch IDs in the new 
tree; so when I try to do a pull from my current repository I get tons of 
conflicts, if I try to do a receive of just the patch set I get a resync error:

takepatch: can't find parent ID
        jgarzik@mandrakesoft.com|ChangeSet|20020225230300|18879
        in RESYNC/SCCS/s.ChangeSet

The thought of taking everything back to the common ancestor and then trying 
to apply the changes one at a time and adding the change logs by hand isn't 
that appealing (I have 3 2.4 repositories, some with upwards of 10 additional 
change sets in them).

James



             reply	other threads:[~2002-03-15  2:38 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2002-03-15  2:38 James Bottomley [this message]
2002-03-15  4:55 ` Problems using new Linux-2.4 bitkeeper repository Jeff Garzik
2002-03-16 16:08   ` James Bottomley
2002-03-16 16:28     ` Jeff Garzik
2002-03-16 16:30       ` Larry McVoy
2002-03-16 16:41         ` Jeff Garzik
2002-03-16 16:52           ` Larry McVoy
2002-03-16 17:06             ` Jeff Garzik
2002-03-16 17:14               ` Larry McVoy
2002-03-16 17:25                 ` Jeff Garzik
2002-03-16 17:38                   ` Larry McVoy
2002-03-16 17:51                     ` Jeff Garzik
2002-03-16 18:31                       ` Christer Weinigel
2002-03-16 18:05                     ` Jeff Garzik
2002-03-16 19:01                       ` Larry McVoy
2002-03-16 19:44                         ` Jeff Garzik
2002-03-17 10:49                 ` David Woodhouse
2002-03-17 15:54                   ` Larry McVoy
2002-03-17 16:23                   ` David Woodhouse
2002-03-17 18:15                     ` Larry McVoy
2002-03-17 18:34                     ` David Woodhouse
2002-03-18 15:25                       ` Tom Rini
2002-03-16 17:17             ` James Bottomley

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=200203150238.g2F2cGe21131@localhost.localdomain \
    --to=james.bottomley@steeleye.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lm@bitmover.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox