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

List:       bitkeeper-users
Subject:    Re: [Bitkeeper-users] Fun with treediff
From:       Rick Smith <rick () bitmover ! com>
Date:       2004-09-10 10:38:57
Message-ID: 20040910103857.GD3092 () work ! bitmover ! com
[Download RAW message or body]

Try:
  bk stripdel -r+ Bitkeeper/deleted/.del-blahblahblah
  bk -r check -f
  bk pending

-- Rick
BitMover

On Fri, Sep 10, 2004 at 11:08:47AM +0100, Brendan Heading wrote:
> 
> Was playing around with Bitkeeper today, and decided to put treediff 
> thru it's paces. I started out with a source tree A of around 3000 
> files, made some changes to that creating source tree B, and then 
> imported that into BK. At the same time, another person took the same 
> source tree and made a different set of changes outside of BK, creating 
> source tree C.
> 
> I decided to run treediff between tree B (in the repo) and tree C. As 
> expected, the treediff created some changes which tried to delete files 
> I'd created in tree B. I imported the diff anyway with import -tpatch -C 
> (so the changeset was not created) and reviewed the result using 
> csettool, committing only the changes which I wanted, and leaving out 
> the deltas I didn't want.
> 
> After committing, I was able to clean out and remove the unwanted deltas 
> with bk fix. However, bk pending shows that there's a bunch of stuff 
> left in the manner of "Bitkeeper/deleted/.del-blahblahblah@1.4". Any 
> ideas on how I can clear up those pending deletion events ?
> 
> [in retrospect, the right thing to do would have been to treediff 
> between tree A and C, and then import that into tree B. But it'd be nice 
> to see how it can be done this way in case, for example, tree A becomes 
> unavailable.]
> 
> Regards
> 
> Brendan
> _______________________________________________
> 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.
_______________________________________________
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]