Re: Problems using new Linux-2.4 bitkeeper repository.

Larry McVoy (lm@bitmover.com)
Sun, 17 Mar 2002 07:54:43 -0800

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 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/