On Mon, May 04, 2009 at 11:08:47AM -0400, Mark Stosberg wrote: || I want to use darcs to manage a Drupal project, which has frequent security || updates. || || My install will have local patches which are not applied upstream. If I just || overlay each new upstream release on my tree, it will revert my local patches. || || What is the the best practice for managing such a situation with darcs, so that || my local patches easy to maintain?
Your vendor branch should mirror the upstream state, precisely so that you can overlay upstream releases. Apply your patches to a local branch, and pull upstream fixes to it via your vendor branch. Take care when resolving conflicts when pulling or await the dreaded exponential merge. Amend your local patches instead if you can. -- Vincent Zweije <[email protected]> | "If you're flamed in a group you <http://www.xs4all.nl/~zweije/> | don't read, does anybody get burnt?" [Xhost should be taken out and shot] | -- Paul Tomblin on a.s.r.
signature.asc
Description: Digital signature
_______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
