On Thu, Aug 11, 2005 at 02:44:11PM +0200, Balazs Scheidler wrote: > On Thu, 2005-08-11 at 22:31 +1000, Herbert Xu wrote: > > Balazs Scheidler <[EMAIL PROTECTED]> wrote: > > > > > > I've attached a revised patch, this time with complete error checking, > > > and > > > propagating the error code to the caller. Please apply. > > > > Sorry, but it seems that you've left out the bits that check the > > return value from xfrm_init()? > > > > Damn. I still have to get used to with git. Thanks for the hint. Anyone > know a git description that tells me how to follow a tree and maintain > my own set of patches on top?
I create one local branch (head) for every "feature/patchset" by doing something like "cp .git/refs/heads/master .git/refs/heads/foo". Then you can switch to the "foo" head by "ln -sf refs/heads/foo .git/HEAD; cg-reset" I then apply the patch (cg-patch) and commit (cg-commit). Whenever I want to sync the upstream tree, i "ln -sf .git/refs/heads/master .git/HEAD; cg-update origin" "ln -sf .git/refs/heads/foo .git/HEAD; cg-reset; cg-merge master" (and iterate over all other heads and do the same). To get a diff to your local master, you can then do "cg-diff -r master:foo" It's not nice, but has been working for me through the last weeks . -- - Harald Welte <[EMAIL PROTECTED]> http://gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)
pgpRBjOxCfcAX.pgp
Description: PGP signature
