Excerpts from Jan Vornberger's message of Sun Sep 13 20:53:07 +0200 2009:
Hi there!
As I'm preparing to merge Bluetile's repository back into xmonad's mainline, I'm a little unsure how to best use Darcs for this goal. I don't have that much experience with Darcs, so I was hoping, I could get some advice on what is the best way to go about this.
So there is the public xmonad repository as well as the public Bluetile repository.
Now let's say I have two kinds of features: Some simple ones, like feature X, that can just go in unchanged. But there might also be some feature Y, where I might decide that for submission as a patch, I have to do it in a somewhat different way. So I want to revert Y and code it again as Z. How do I do this? I can think of these ways:
1. Have a new repository based on xmonad's mainline, where I incrementally pull in stuff from Bluetile's repo and polish it up. So in this case, I would pull X, but not pull Y, instead write a new patch for this repo that implements Z. Seems like a simple approach to me, but has the disadvantage, that Bluetile's repo will never get in sync with xmonad's repo, because it still has the X stuff.
I think that this is your better option. Which I can rephrase as: * pull as much as possible all the patches that you want to publish unchanged * for each other feature: - minor change (one patch): + pull the patch + polish the code + amend-record it - major change + pull the patches + unrecord them + polish the code + record as one or several patches Best regards, -- Nicolas Pouillard http://nicolaspouillard.fr