[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 15:54:11 UTC 2008


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?

> Fri Sep 26 15:30:48 BST 2008  Eric Kow <E.Y.Kow at brighton.ac.uk>
>   * Rollback issue27 fix (due to a darcs 2.1 feature freeze and issue1102)
>   
>   rolling back:
>   
>   Wed Sep 17 16:46:57 BST 2008  David Roundy <droundy at darcs.net>
>     * resolve issue27: add junk to patch identifiers.
>     Ignore-this: b91ab6f6e05e0fda25488fa51653b741
>   
>       M ./configure.ac +3
>       M ./src/Darcs/Commands/AmendRecord.lhs -2 +3
>       M ./src/Darcs/Commands/Record.lhs -3 +4
>       M ./src/Darcs/Commands/Rollback.lhs -1 +2
>       M ./src/Darcs/Commands/Tag.lhs -2 +2
>       M ./src/Darcs/Commands/Unrevert.lhs -3 +2
>       M ./src/Darcs/Patch/Core.lhs -3 +7
>       M ./src/Darcs/Patch/Info.lhs -9 +29
>       M ./src/Darcs/Population.lhs -2 +2
>       M ./src/Darcs/Repository/Internal.lhs -1 +2
>       M ./src/Darcs/SelectChanges.lhs -1 +1
> 
> Fri Sep 26 15:34:54 BST 2008  Eric Kow <E.Y.Kow at brighton.ac.uk>
>   * Resolve issue1102: do not generate patch log junk
>   
>   This patch and the issue27 rollback allow for darcs 2.1 to understand patch
>   log 'junk' generated by future versions of darcs without actually generating
>   it.  These two patches are motivated by a feature freeze: we do not want the
>   issue27 patches for imminent release, but we want to make sure that future
>   versions of darcs can generate the requisite junk without harming the darcs
>   2.1 user experience.
> 
> Fri Sep 26 15:40:29 BST 2008  Eric Kow <E.Y.Kow at brighton.ac.uk>
>   * Restore junk-generation from previous issue27 patch.
> 
> Fri Sep 26 15:47:30 BST 2008  Eric Kow <E.Y.Kow at brighton.ac.uk>
>   * Rollback hokey unit test fix for issue27
>   This is also related to the darcs 2.1 feature freeze.
>   
>   rolling back:
>   
>   Wed Sep 17 18:09:13 BST 2008  David Roundy <droundy at darcs.net>
>     * hokey fix to allow unit tests to generate random input.
>     Ignore-this: 31e847e82eef741f4c6cc857fd79a245
>     A nicer fix would be to move namepatch and patchinfo into some sort of
>     random-number monad rather than leaving them in IO and using
>     unsafePerformIO in the example-generation scripts.
>   
>       M ./src/Darcs/Patch/Test.lhs -1 +6
>       M ./src/unit.lhs -1 +4
> 
> Fri Sep 26 15:49:12 BST 2008  Eric Kow <E.Y.Kow at brighton.ac.uk>
>   * Restore issue27 unit test fix.
> 
> Fri Sep 26 15:50:11 BST 2008  Eric Kow <E.Y.Kow at brighton.ac.uk>
>   * Rollback 'simplify patches in rollback'
>   This is due to the darcs 2.1 feature freeze.
>   rolling back:
>   
>   Tue Sep 23 16:06:19 BST 2008  David Roundy <droundy at darcs.net>
>     * simplify patches in rollback.
>     Ignore-this: fd3d327f800e2f1799ec97bc4524f612
>     This makes it nicer to incrementally rollback changes from one large
>     change:  you aren't prompted for changes that have already been rolled
>     back.
>   
>       M ./src/Darcs/Commands/Rollback.lhs -2 +2
> 
> Fri Sep 26 15:50:25 BST 2008  Eric Kow <E.Y.Kow at brighton.ac.uk>
>   * Restore darcs rollback simplification.


More information about the darcs-users mailing list