[darcs-users] darcs patch: Rollback issue27 fix (due to a darcs 2.1... (and 6 more)

David Roundy droundy at darcs.net
Fri Sep 26 16:59:37 UTC 2008


On Fri, Sep 26, 2008 at 05:06:20PM +0100, Eric Kow wrote:
> > 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 :-(

I like the rollbacky route, but think that five patches is three more
than we need.  You can amend the rollback patch to make it do what you
want.  Right now this is a well-nigh incomprehensible sequence of
patches!

David
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.osuosl.org/pipermail/darcs-users/attachments/20080926/93bdd0c4/attachment.pgp 


More information about the darcs-users mailing list