Hi,

I was about to upgrade an old checkout of the haddock darcs repository
when darcs said this:

~/build/haskell/haddock $ darcs pull
Pulling from "http://code.haskell.org/haddock"...
Sun Apr  5 14:42:53 CEST 2009  David Waern <david.waern@gmail.com>
  * Move H.GHC.Utils to H.GhcUtils
Shall I pull this patch? (1/574)  [ynW...], or ? for more options: y
Sun Apr  5 14:57:21 CEST 2009  David Waern <david.waern@gmail.com>
  * Remove Haddock.GHC and move its (small) contents to Main
Shall I pull this patch? (2/574)  [ynW...], or ? for more options: y
Sun Apr  5 15:07:04 CEST 2009  David Waern <david.waern@gmail.com>
  * Fix whitespace and stylistic issues in Main
Shall I pull this patch? (3/574)  [ynW...], or ? for more options: a
                                                              
Warning: CRC errors found. These are probably harmless but should be repaired.
See 'darcs gzcrcs --help' for more information.

darcs: bug at src/Darcs/Patch/Commute.lhs:598 compiled Jun 13 2011 15:04:04
in function reconcileUnwindings
Original patch:
merger 0.0 (
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 74
+#elif __GLASGOW_HASKELL__ == 612
+binaryInterfaceVersion = 15
+#elif __GLASGOW_HASKELL__ == 613
+binaryInterfaceVersion = 15
+#else
+#error Unknown GHC version
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 73
-binaryInterfaceVersion = 13
+binaryInterfaceVersion = 15
hunk ./src/Haddock/InterfaceFile.hs 74
+*************
+#if __GLASGOW_HASKELL__ >= 609
+binaryInterfaceVersion = 4
+--binaryInterfaceVersion = 10
+^ ^ ^ ^ ^ ^ ^
)
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 69
+v v v v v v v
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 66
+^ ^ ^ ^ ^ ^ ^
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 62
+v v v v v v v
+binaryInterfaceVersion = 8
+*************
hunk ./src/Haddock/InterfaceFile.hs 61
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 2
-binaryInterfaceVersion = 9
-#endif         
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 3
-binaryInterfaceVersion = 10
-#endif           
)
)
)
hunk ./src/Haddock/InterfaceFile.hs 71
+*************
+binaryInterfaceVersion = 9
+^ ^ ^ ^ ^ ^ ^
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 66
+^ ^ ^ ^ ^ ^ ^
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 62
+v v v v v v v
+binaryInterfaceVersion = 8
+*************
hunk ./src/Haddock/InterfaceFile.hs 61
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 2
-binaryInterfaceVersion = 9
-#endif         
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 3
-binaryInterfaceVersion = 10
-#endif           
)
)
hunk ./src/Haddock/InterfaceFile.hs 69
+v v v v v v v
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 62
+v v v v v v v
+binaryInterfaceVersion = 8
+*************
hunk ./src/Haddock/InterfaceFile.hs 61
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 2
-binaryInterfaceVersion = 9
-#endif         
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 3
-binaryInterfaceVersion = 10
-#endif           
)
hunk ./src/Haddock/InterfaceFile.hs 66
+^ ^ ^ ^ ^ ^ ^
)
merger 0.0 (
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 61
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 2
-binaryInterfaceVersion = 9
-#endif         
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 3
-binaryInterfaceVersion = 10
-#endif           
hunk ./src/Haddock/InterfaceFile.hs 62
+v v v v v v v
+binaryInterfaceVersion = 8
+*************
)
hunk ./src/Haddock/InterfaceFile.hs 61
-#if __GLASGOW_HASKELL__ == 610 && __GHC_PATCHLEVEL__ == 1
-binaryInterfaceVersion = 11
-#endif
-#if __GLASGOW_HASKELL__ == 610 && __GHC_PATCHLEVEL__ == 2
+#if __GLASGOW_HASKELL__ == 610
)
)
)
)
merger 0.0 (
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 71
+*************
+binaryInterfaceVersion = 9
+^ ^ ^ ^ ^ ^ ^
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 69
+v v v v v v v
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 66
+^ ^ ^ ^ ^ ^ ^
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 62
+v v v v v v v
+binaryInterfaceVersion = 8
+*************
hunk ./src/Haddock/InterfaceFile.hs 61
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 2
-binaryInterfaceVersion = 9
-#endif         
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 3
-binaryInterfaceVersion = 10
-#endif           
)
)
)
)
hunk ./src/Haddock/InterfaceFile.hs 75
+v v v v v v v
)
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 66
+^ ^ ^ ^ ^ ^ ^
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 62
+v v v v v v v
+binaryInterfaceVersion = 8
+*************
hunk ./src/Haddock/InterfaceFile.hs 61
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 2
-binaryInterfaceVersion = 9
-#endif         
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 3
-binaryInterfaceVersion = 10
-#endif           
)
)
hunk ./src/Haddock/InterfaceFile.hs 69
+v v v v v v v
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 62
+v v v v v v v
+binaryInterfaceVersion = 8
+*************
hunk ./src/Haddock/InterfaceFile.hs 61
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 2
-binaryInterfaceVersion = 9
-#endif         
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 3
-binaryInterfaceVersion = 10
-#endif           
)
hunk ./src/Haddock/InterfaceFile.hs 66
+^ ^ ^ ^ ^ ^ ^
)
merger 0.0 (
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 61
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 2
-binaryInterfaceVersion = 9
-#endif         
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 3
-binaryInterfaceVersion = 10
-#endif           
hunk ./src/Haddock/InterfaceFile.hs 62
+v v v v v v v
+binaryInterfaceVersion = 8
+*************
)
hunk ./src/Haddock/InterfaceFile.hs 61
-#if __GLASGOW_HASKELL__ == 610 && __GHC_PATCHLEVEL__ == 1
-binaryInterfaceVersion = 11
-#endif
-#if __GLASGOW_HASKELL__ == 610 && __GHC_PATCHLEVEL__ == 2
+#if __GLASGOW_HASKELL__ == 610
)
)
)
merger 0.0 (
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 69
+v v v v v v v
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 66
+^ ^ ^ ^ ^ ^ ^
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 62
+v v v v v v v
+binaryInterfaceVersion = 8
+*************
hunk ./src/Haddock/InterfaceFile.hs 61
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 2
-binaryInterfaceVersion = 9
-#endif         
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 3
-binaryInterfaceVersion = 10
-#endif           
)
)
)
hunk ./src/Haddock/InterfaceFile.hs 71
+*************
+binaryInterfaceVersion = 9
+^ ^ ^ ^ ^ ^ ^
)
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 62
+v v v v v v v
+binaryInterfaceVersion = 8
+*************
hunk ./src/Haddock/InterfaceFile.hs 61
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 2
-binaryInterfaceVersion = 9
-#endif         
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 3
-binaryInterfaceVersion = 10
-#endif           
)
hunk ./src/Haddock/InterfaceFile.hs 66
+^ ^ ^ ^ ^ ^ ^
)
merger 0.0 (
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 61
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 2
-binaryInterfaceVersion = 9
-#endif         
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 3
-binaryInterfaceVersion = 10
-#endif           
hunk ./src/Haddock/InterfaceFile.hs 62
+v v v v v v v
+binaryInterfaceVersion = 8
+*************
)
hunk ./src/Haddock/InterfaceFile.hs 61
-#if __GLASGOW_HASKELL__ == 610 && __GHC_PATCHLEVEL__ == 1
-binaryInterfaceVersion = 11
-#endif
-#if __GLASGOW_HASKELL__ == 610 && __GHC_PATCHLEVEL__ == 2
+#if __GLASGOW_HASKELL__ == 610
)
)
merger 0.0 (
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 66
+^ ^ ^ ^ ^ ^ ^
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 62
+v v v v v v v
+binaryInterfaceVersion = 8
+*************
hunk ./src/Haddock/InterfaceFile.hs 61
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 2
-binaryInterfaceVersion = 9
-#endif         
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 3
-binaryInterfaceVersion = 10
-#endif           
)
)
hunk ./src/Haddock/InterfaceFile.hs 69
+v v v v v v v
)
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 61
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 2
-binaryInterfaceVersion = 9
-#endif         
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 3
-binaryInterfaceVersion = 10
-#endif           
hunk ./src/Haddock/InterfaceFile.hs 62
+v v v v v v v
+binaryInterfaceVersion = 8
+*************
)
hunk ./src/Haddock/InterfaceFile.hs 61
-#if __GLASGOW_HASKELL__ == 610 && __GHC_PATCHLEVEL__ == 1
-binaryInterfaceVersion = 11
-#endif
-#if __GLASGOW_HASKELL__ == 610 && __GHC_PATCHLEVEL__ == 2
+#if __GLASGOW_HASKELL__ == 610
)
merger 0.0 (
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 62
+v v v v v v v
+binaryInterfaceVersion = 8
+*************
hunk ./src/Haddock/InterfaceFile.hs 61
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 2
-binaryInterfaceVersion = 9
-#endif         
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 3
-binaryInterfaceVersion = 10
-#endif           
)
hunk ./src/Haddock/InterfaceFile.hs 66
+^ ^ ^ ^ ^ ^ ^
)
)
merger 0.0 (
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 61
-#if __GLASGOW_HASKELL__ == 610 && __GHC_PATCHLEVEL__ == 1
-binaryInterfaceVersion = 11
-#endif
-#if __GLASGOW_HASKELL__ == 610 && __GHC_PATCHLEVEL__ == 2
+#if __GLASGOW_HASKELL__ == 610
merger 0.0 (
hunk ./src/Haddock/InterfaceFile.hs 61
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 2
-binaryInterfaceVersion = 9
-#endif         
-#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 3
-binaryInterfaceVersion = 10
-#endif           
hunk ./src/Haddock/InterfaceFile.hs 62
+v v v v v v v
+binaryInterfaceVersion = 8
+*************
)
)
hunk ./src/Haddock/InterfaceFile.hs 61
-#if __GLASGOW_HASKELL__ == 610
-binaryInterfaceVersion = 14
-#elif __GLASGOW_HASKELL__ == 611
-binaryInterfaceVersion = 15
-#elif __GLASGOW_HASKELL__ == 612
+#if __GLASGOW_HASKELL__ == 612
)
)
)
)
)
)
See http://wiki.darcs.net/BugTracker/Reporting for help on bug reporting.


It is reproducible, I have attached a tarball with the repository.

Greetings,
Joachim

-- 
Joachim "nomeata" Breitner
  mail: mail@joachim-breitner.de | ICQ# 74513189 | GPG-Key: 4743206C
  JID: nomeata@joachim-breitner.de | http://www.joachim-breitner.de/
  Debian Developer: nomeata@debian.org

Attachments

• haddock-buggy-repo.tar.gz

Hi,

Am Sonntag, den 19.06.2011, 19:56 +0000 schrieb Joachim Breitner:
> I was about to upgrade an old checkout of the haddock darcs repository
> when darcs said this:

I forgot to add:

$ darcs --version
2.5.2 (release)


Maybe you should automatically include the version number in this line:

> See http://wiki.darcs.net/BugTracker/Reporting for help on bug reporting.

then people don’t forget it when copy’n’pasting.

Greetings,
Joachim
-- 
Joachim "nomeata" Breitner
  mail: mail@joachim-breitner.de | ICQ# 74513189 | GPG-Key: 4743206C
  JID: nomeata@joachim-breitner.de | http://www.joachim-breitner.de/
  Debian Developer: nomeata@debian.org

Note that this is a Darcs 1 related bug, which may put it a bit on the 
back burner.

I recommend we compare this with issue2046 which has the same 
reconcileUnwindings message from a QuickCheck test (!).  Is this the 
same bug as what Iago found?

Joachim: please shout if you guys need help getting unstuck.  Maybe 
Ganesh can assist with rebase? [I don't mean to volunteer him, mind you 
:-)]

Hi,

Am Donnerstag, den 23.06.2011, 10:01 +0000 schrieb Eric Kow:
> Joachim: please shout if you guys need help getting unstuck.  Maybe 
> Ganesh can assist with rebase? [I don't mean to volunteer him, mind you 
> :-)]

not at all, I don’t think this repo had any changes by me at all, or if
it had, none that I care about. I only reported it in case you can make
some use out of it.

Greetings,
Joachim

-- 
Joachim "nomeata" Breitner
  mail: mail@joachim-breitner.de | ICQ# 74513189 | GPG-Key: 4743206C
  JID: nomeata@joachim-breitner.de | http://www.joachim-breitner.de/
  Debian Developer: nomeata@debian.org