Re: Problems using new Linux-2.4 bitkeeper repository.

[Larry McVoy <lm@bitmover.com>]

On Sun, Mar 17, 2002 at 04:23:21PM +0000, David Woodhouse wrote:
> 
> lm@bitmover.com said:
> >  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.
> 
> If it was changes that deserved a changelog, I'd have committed them. But 
> it's typically one-line hacks to make it compile, which I know will be 
> obsoleted by 'correct' fixes in Linus' tree later. 

Then you get to save them as diffs, unedit the files, and put them back 
after the merge.

> Btw, the citool is cute but would be cuter if
>  - the diffs were '-up' format - showing the function that the hunk is in.

citool is a tcl program, how about you hack it in?  Look for $diffsOpts,
that's what you'll need to modify.  You need to get the diffs parsing 
code to do the right thing with -up style diffs though.

>  - You could select a hunk and say "omit this change from what's committed"

Get bk-2.1.5.  We added multiple options to the edit button, try the fmtool
option and learn how to use it.  You can trivially walk the code and pick
and choose which diffs you want.

> Another thing I have a distinct feeling I'm going to want is tracking
> functions across files. I sometimes shuffle functions between files for
> portability - selective compilation is nicer with your Linux-specific
> functions in one file and eCos-specific functions in another than with a
> litter of ifdefs. If Linus' tree gets a patch to a file that I moved, BK can
> work it out. If Linus' tree gets a patch to a _function_ that I moved to a
> different file while leaving the rest of the original file in place, AFAICT
> not even the merge tool deals with that nicely. Did I miss an option to
> 'apply this diff hunk to a different file'?

We don't have this feature.  We've talked about it, but that's all we've
done.
-- 
---
Larry McVoy            	 lm at bitmover.com           http://www.bitmover.com/lm