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

List:       bitkeeper-users
Subject:    [Bitkeeper-users] bk import idea
From:       Nicholas Wourms <nwourms () myrealbox ! com>
Date:       2003-05-30 21:35:39
[Download RAW message or body]

Hi Larry,

I have been fiddling around with using `bk import -tpatch -Cvf` to pull 
in patches rather then applying them with the patch command[as I usually 
do].  I noticed that bk doesn't gracefully handle conflicts, it just 
exits, leaving some reject and backup files behind.  I don't know if it 
is possible, but it would be nice to have some sort of tool that allows 
one to hand merge the rejects similar to how fmtool does it.  I'm not 
sure how it would look, perhaps have the file on the left and the 
rejected hunks on the right.  Perhaps then bk would take a best guess, 
by evaluating the context and matching it to code in the target file, at 
suggesting where the hunk should go?  This could be quite a time saver, 
especially since it minimizes formatting boo-boos caused by large 
handmerges.  Just a thought...

Cheers,
Nicholas


_______________________________________________
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]