From: Jeff Garzik <jgarzik@mandrakesoft.com>
To: James Bottomley <James.Bottomley@SteelEye.com>
Cc: lm@bitmover.com, linux-kernel@vger.kernel.org
Subject: Re: Problems using new Linux-2.4 bitkeeper repository.
Date: Sat, 16 Mar 2002 11:28:46 -0500 [thread overview]
Message-ID: <3C9372BE.4000808@mandrakesoft.com> (raw)
In-Reply-To: <200203161608.g2GG8WC05423@localhost.localdomain>
James Bottomley wrote:
>jgarzik@mandrakesoft.com said:
>
>>Through the magic of BK :)
>>
>
>>Just do a 'bk pull' on my marcelo-2.4 tree. Since it is based on the
>>original linux-2.4 tree just like Marcelo's tree, I was able to merge
>>from my 2.4 line to his 2.4 line.
>>
>
>Well, I tried this, but it just gave me a slew of initial rename conflicts.
>
This is normal, you just need to accept the remote changes for all those
new/renamed files. BitKeeper doesn't support doing this automatically
for all files, so I had to highlight the expected BitKeeper response in
another window, and then click <paste> on my mouse around 300 times...
(~300 new files)
Jeff
next prev parent reply other threads:[~2002-03-16 16:29 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-03-15 2:38 Problems using new Linux-2.4 bitkeeper repository James Bottomley
2002-03-15 4:55 ` Jeff Garzik
2002-03-16 16:08 ` James Bottomley
2002-03-16 16:28 ` Jeff Garzik [this message]
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=3C9372BE.4000808@mandrakesoft.com \
--to=jgarzik@mandrakesoft.com \
--cc=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 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.