[commit: testsuite] ghc-generics: Revert "Revert commits 53b30fac9fc30d9d85cc... and c8244f5cd31774de2e39... as they were not intended for master." (9e6e6b0)

[José Pedro Magalhães]

Uhm, this was a "git revert HEAD" on the ghc-generics branch, after pulling
all patches from master, basically to "revert the revert", as the patches
that I reverted on master were intended for this branch. The real revert, on
master, was
https://github.com/ghc/testsuite/commit/d2fab4d8c428fc0a3b0f8ad288fc50d8d6ef0950

Or did I do something wrong again?...


Pedro

2011/5/3 Simon Peyton-Jones <simonpj at microsoft.com>

> It looks as if you committed the 'revert' patch on the ghc-generics branch,
> whereas you intended to do it on the master branch?
>
> Simon
>
> | -----Original Message-----
> | From: cvs-ghc-bounces at haskell.org [mailto:cvs-ghc-bounces at haskell.org]
> On
> | Behalf Of José Pedro Magalhães
> | Sent: 02 May 2011 20:54
> | To: cvs-ghc at haskell.org
> | Subject: [commit: testsuite] ghc-generics: Revert "Revert commits
> | 53b30fac9fc30d9d85cc... and c8244f5cd31774de2e39... as they were not
> intended
> | for master." (9e6e6b0)
> |
> | Repository : ssh://darcs.haskell.org//srv/darcs/testsuite
> |
> | On branch  : ghc-generics
> |
> |
> http://hackage.haskell.org/trac/ghc/changeset/9e6e6b0a7d7ece8f94e53a0d45c8b95
> | c49895a71
> |
> | >---------------------------------------------------------------
> |
> | commit 9e6e6b0a7d7ece8f94e53a0d45c8b95c49895a71
> | Author: Jose Pedro Magalhaes <jpm at cs.uu.nl>
> | Date:   Mon May 2 21:11:28 2011 +0200
> |
> |     Revert "Revert commits 53b30fac9fc30d9d85cc... and
> | c8244f5cd31774de2e39... as they were not intended for master."
> |
> |     This reverts commit d2fab4d8c428fc0a3b0f8ad288fc50d8d6ef0950, because
> | these changes were intended for this branch.
> |
> |  tests/ghc-regress/generics/GEq/GEq.hs              |   47
> +++++++++++++++++
> |  tests/ghc-regress/generics/GEq/GEq1.stdout         |    3 +
> |  tests/ghc-regress/generics/GEq/Main.hs             |   31 +++++++++++
> |  .../{array/should_run => generics/GEq}/Makefile    |    0
> |  tests/ghc-regress/generics/GEq/test.T              |    3 +
> |  tests/ghc-regress/{array => generics}/Makefile     |    0
> |  tests/ghc-regress/generics/Uniplate/Main.hs        |   20 +++++++
> |  .../should_run => generics/Uniplate}/Makefile      |    0
> |  tests/ghc-regress/generics/Uniplate/Uniplate.hs    |   53
> | ++++++++++++++++++++
> |  .../ghc-regress/generics/Uniplate/Uniplate1.stdout |    1 +
> |  tests/ghc-regress/generics/Uniplate/test.T         |    3 +
> |  tests/ghc-regress/generics/all.T                   |    7 +++
> |  tests/ghc-regress/generics/canDoRep0.hs            |   14 +++++
> |  tests/ghc-regress/generics/cannotDoRep0.hs         |    9 +++
> |  tests/ghc-regress/generics/cannotDoRep1.hs         |    8 +++
> |  tests/ghc-regress/generics/cannotDoRep2.hs         |   13 +++++
> |  .../simplCore/should_run/simplrun009.hs            |    6 ++
> |  .../ghc-regress/typecheck/should_compile/T2573.hs  |   13 -----
> |  tests/ghc-regress/typecheck/should_compile/all.T   |    3 +-
> |  tests/ghc-regress/typecheck/should_fail/all.T      |    1 -
> |  .../ghc-regress/typecheck/should_fail/tcfail163.hs |   29 -----------
> |  .../typecheck/should_fail/tcfail163.stderr         |   21 --------
> |  22 files changed, 219 insertions(+), 66 deletions(-)
> |
> |
> | Diff suppressed because of size. To see it, use:
> |
> |     git show 9e6e6b0a7d7ece8f94e53a0d45c8b95c49895a71
> |
> | _______________________________________________
> | Cvs-ghc mailing list
> | Cvs-ghc at haskell.org
> | http://www.haskell.org/mailman/listinfo/cvs-ghc
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.haskell.org/pipermail/cvs-ghc/attachments/20110503/7ce894cd/attachment-0001.htm>