> On Fri, Sep 26, 2008 at 07:53:32AM -0700, Eric Kow wrote: > > Ok, this bundle of patches should allow me to pull every stable patch into > > the > > release branch and maintain the feature freeze. It means that I should be > > able > > to collapse the two branches and freeze stable, as Simon Michael suggests > > Just to be clear: You're doing rollback/unrollback because you pulled > stuff into the stable branch that you don't want?
That's one reason: I was initially thinking of the stable as something separate from the release branch, and so pulled some stuff in that I did not want for release. The main reason is that I want half of the issue27 fix (junk-recognition) for 2.1 but not the other half (junk-generation) yet. One way to go about it was to generate a patch for my release branch, which conflicts with stable (and the resolution patch), the other way was to rollback/unrollback, which I've generalised here. I actually don't need all these rollback/unrollbacks; I could continue with the status quo of having my separate release branch without the patches I don't want. But I would like to see some form of a issue1102 resolution, be it the conflicty route, or the rollbacky route. Sorry for the mess :-( -- Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow> PGP Key ID: 08AC04F9
signature.asc
Description: Digital signature
_______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
