[darcs-users] Merging several patches into one

[Isaac Devine]

On Wed, 21 Jun 2006 04:48:49 +0200
Jan Braun <janbraun at gmx.de> wrote:

> Richard A. Smith schrob:
> > Do this 3 times.  So now you have 30 new patches pushed out to the
> > repo. Other people pull all of them but eventually you think that
> > feature 2 still has some problems.  Sorting out what patches for
> > other to unpull can be somewhat confusing.  Especially if its been
> > a month since you wrote those patches.
> 
> If you just want to get rid of the feature, I wouldn't try to make
> everyone unpull the patches, but record a new patch called "revert
> feature 2" (created by unpulling from a temporary repo, copying the
> relevant files into an up-to date repo and recording there).
Even better is to use darcs rollback - it creates a patch which
"reverts" the chosen patch. It can then be pushed,pulled just like any
other patch


> That way, the others simply 'darcs pull' to remove it, and you don't
> have to worry whether a surviving instance of the patches might
> someday appear in your repo and cause conflicts or bugs. This might
> not be aesthetically pleasing, it will record in the history that you
> implement bad features, and you will still have the code if you
> change your mind once again ;)
> 
> If you want "this feature is not ready yet, let's remove it until I've
> ironed out the bugs", then I don't think there's a good/easy solution
> (except maybe #ifdef).
> 
> HTH,
>     Jan
> 
> 
> 
> _______________________________________________
> darcs-users mailing list
> darcs-users at darcs.net
> http://www.abridgegame.org/mailman/listinfo/darcs-users