[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bitkeeper-users
Subject:    Re: [Bitkeeper-users] Content merge clarification
From:       Paul Mundt <lethal () linux-sh ! org>
Date:       2004-01-08 18:16:36
Message-ID: 20040108181636.GA16200 () linux-sh ! org
[Download RAW message or body]

On Thu, Jan 08, 2004 at 09:54:39AM -0800, Larry McVoy wrote:
> You want to do this
> 
> 	cd arch/sh64/kernel
> 	bk rm Makefile
> 	bk mv `bk root`/BitKeeper/deleted/.del-Makefile~1 Makefile
> 	bk commit -y'Fix up makefile mess'
> 
Ah, ok. Is there an easy way to avoid this happening again in the future?
Or should I just tell it to use the remote copy instead of the local copy
at resolve time to ward this off in the future?

> Also, what version of BK are you running, this looks like it might be old.
> 
This is with bk 3.0.2. I see 3.0.4 is current, I'll update and see if the
behavior persists.

[Attachment #3 (application/pgp-signature)]
_______________________________________________
Bitkeeper-users mailing list
Bitkeeper-users@bitmover.com
http://bitmover.com/mailman/listinfo/bitkeeper-users
To unsubscribe from this list, go to the above URL, follow instruction at the bottom of the web page.

[prev in list] [next in list] [prev in thread] [next in thread]