Re: "bk pull" is not updating my local repository
Larry McVoy <[email protected]>
| Newsgroups | gmane.comp.version-control.bitkeeper.user |
|---|---|
| Message-ID | <[email protected]> |
On Mon, Aug 23, 2004 at 11:33:41PM +0200, Sam Ravnborg wrote: > bk diffs -p `bk sfiles -c ` > fish > bk unedit `bk sfiles -c` > bk pull > bk patch -p1 < fish Slightly more robust version of that (which I use a lot) cd `bk root` bk -r diffs -up > DIFFS bk sfiles -c | bk unedit - # works on older Unices bk pull bk patch -p1 -g1 < DIFFS # locks files as needed It's a mess to clean up if you have patch rejects. bk import -tpatch does more or less the same thing (import is a shell script, go look if you like) and tries to walk you through the rejects. Has anyone who makes a habit of doing this looked at wiggle? It looks interesting but I rarely have patch rejects. Find it here and let us know if you want it integrated into "bk import -tpatch" http://cgi.cse.unsw.edu.au/~neilb/source/wiggle/ -- --- Larry McVoy lm at bitmover.com http://www.bitkeeper.com _______________________________________________ Bitkeeper-users mailing list [email protected] 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.