From: Larry McVoy <lm@bitmover.com>
To: David Woodhouse <dwmw2@infradead.org>
Cc: Jeff Garzik <jgarzik@mandrakesoft.com>,
Larry McVoy <lm@bitmover.com>,
James Bottomley <James.Bottomley@SteelEye.com>,
linux-kernel@vger.kernel.org
Subject: Re: Problems using new Linux-2.4 bitkeeper repository.
Date: Sun, 17 Mar 2002 07:54:43 -0800 [thread overview]
Message-ID: <20020317075443.A15420@work.bitmover.com> (raw)
In-Reply-To: <3C938027.4040805@mandrakesoft.com> <200203161608.g2GG8WC05423@localhost.localdomain> <3C9372BE.4000808@mandrakesoft.com> <20020316083059.A10086@work.bitmover.com> <3C9375B7.3070808@mandrakesoft.com> <20020316085213.B10086@work.bitmover.com> <3C937B82.60500@mandrakesoft.com> <20020316091452.E10086@work.bitmover.com> <3C938027.4040805@mandrakesoft.com> <30393.1016362174@redhat.com>
In-Reply-To: <30393.1016362174@redhat.com>; from dwmw2@infradead.org on Sun, Mar 17, 2002 at 10:49:34AM +0000
On Sun, Mar 17, 2002 at 10:49:34AM +0000, David Woodhouse wrote:
> But then BK wouldn't even let me pull from Linus' tree any more, because I
> had locked and modified files. That also seems to be a fundamental flaw.
BK works that way on purpose. If we merge changes into your local changes,
there is no automatic way to "unmerge". It is way to easy to do a pull,
do the merge, and then realize you lost work in the merge because you told
it to do the wrong thing.
Short summary: commit your changes before you pull and you'll be fine.
--
---
Larry McVoy lm at bitmover.com http://www.bitmover.com/lm
next prev parent reply other threads:[~2002-03-17 15:55 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
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 [this message]
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=20020317075443.A15420@work.bitmover.com \
--to=lm@bitmover.com \
--cc=James.Bottomley@SteelEye.com \
--cc=dwmw2@infradead.org \
--cc=jgarzik@mandrakesoft.com \
--cc=linux-kernel@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.