[darcs-users] rollback and dependencies

Andrew Pimlott andrew at pimlott.net
Tue May 11 21:10:32 UTC 2004


On Fri, May 07, 2004 at 01:02:58AM +0200, Tommy Pettersson wrote:
> I recorded a feature (among others), increased the version
> number and tagged a new release.  Later I decided the feature
> was no good, and wanted to undo it.  I could (of course)
> not unrecord the feature patch, since the tag patch depended
> on it to retain that version.  But, neither could I rollback
> the feature patch.  However, I could in a temp repo unrecord
> the tag patch and rollback the feature patch there, and then
> pull this rollback patch back into the original repo.

It strikes me as unintuitive that you can't rollback in the initial
repository (presumably because the feature patch doesn't commute with
the tag), yet when you do the branch-unrecord-rollback-pull sequence you
describe, you don't get any conflict.  I would think it should be one or
the other.

> Could rollback be given an option to have the constructed
> reverse patch "passed on" to pull/apply, to accomplice this
> without branching?  Unfortunately this will make rollback
> modify the working copy in this case.

Can rollback simply be made smart enough to create an undo patch despite
the tag?  I guess it needs to check that later patches don't conflict,
not that they commute.  However, I don't have a good sense of the
difference between "don't conflict" and "commute".

Andrew




More information about the darcs-users mailing list