update submodules for GHC.HetMet.GArrow -> Control.GArrow renaming

[ghc-hetmet.git] / .darcs-boring

diff --git a/.darcs-boring b/.darcs-boring
index 86d1dcb..a1a6445 100644 (file)
--- a/.darcs-boring
+++ b/.darcs-boring
@@ -33,7 +33,6 @@
 ^libraries/HUnit(/|$)
 ^libraries/HaXml(/|$)
 ^libraries/Japi(/|$)
-^libraries/ObjectIO(/|$)
 ^libraries/OpenAL(/|$)
 ^libraries/OpenGL(/|$)
 ^libraries/QuickCheck(/|$)
@@ -42,17 +41,23 @@
 ^libraries/array(/|$)
 ^libraries/arrows(/|$)
 ^libraries/base(/|$)
+^libraries/base3-compat(/|$)
+^libraries/binary(/|$)
 ^libraries/bytestring(/|$)
 ^libraries/cgi(/|$)
 ^libraries/concurrent(/|$)
 ^libraries/containers(/|$)
 ^libraries/directory(/|$)
+^libraries/editline(/|$)
 ^libraries/fgl(/|$)
 ^libraries/filepath(/|$)
+^libraries/getopt(/|$)
+^libraries/ghc-prim(/|$)
 ^libraries/haskell-src(/|$)
 ^libraries/haskell98(/|$)
 ^libraries/hpc(/|$)
 ^libraries/html(/|$)
+^libraries/integer-.*(/|$)
 ^libraries/old-locale(/|$)
 ^libraries/old-time(/|$)
 ^libraries/monads(/|$)
@@ -69,14 +74,22 @@
 ^libraries/regex-base(/|$)
 ^libraries/regex-compat(/|$)
 ^libraries/regex-posix(/|$)
+^libraries/st(/|$)
 ^libraries/stm(/|$)
+^libraries/syb(/|$)
 ^libraries/template-haskell(/|$)
 ^libraries/time(/|$)
+^libraries/timeout(/|$)
 ^libraries/unique(/|$)
 ^libraries/unix(/|$)
 ^libraries/xhtml(/|$)
+^libraries/dph(/|$)
+^libraries/utf8-string(/|$)
+^libraries/terminfo(/|$)
+^libraries/haskeline(/|$)
+^libraries/extensible-exceptions(/|$)
 # Other library bits that get generated:
-^libraries/bootstrapping\.
+^libraries/bootstrapping/
 ^libraries/stamp/
 ^libraries/ifBuildable(/|$)
 ^libraries/installPackage(/|$)
@@ -95,6 +108,7 @@
 \.hi-boot$
 \.o-boot$
 \.p_o$
+\.t_o$
 \.debug_o$
 \.thr_o$
 \.thr_p_o$
@@ -128,6 +142,8 @@
 (^|/)BitKeeper($|/)
 (^|/)ChangeSet($|/)
 (^|/)\.svn($|/)
+(^|/)\.git($|/)
+\.git-ignore$
 \.py[co]$
 \#
 \.cvsignore$
@@ -137,6 +153,8 @@
 ^compiler/primop-
 ^compiler/cmm/CmmLex.hs$
 ^compiler/cmm/CmmParse.hs$
+^compiler/ghci/LibFFI.hs$
+^compiler/ghci/LibFFI_hsc.c$
 ^compiler/main/Config.hs$
 ^compiler/main/ParsePkgConf.hs$
 ^compiler/parser/Parser.y$
@@ -146,16 +164,24 @@
 ^compiler/parser/HaddockLex.hs
 ^compiler/parser/HaddockParse.hs
 ^compiler/prelude/primops.txt$
-^compiler/stage1
-^compiler/stage2
-^compiler/stage3
+^compiler/stage1($|/)
+^compiler/stage2($|/)
+^compiler/stage3($|/)
+^compiler/utils/Fingerprint.hs$
+^compiler/utils/Fingerprint_hsc.c$
 ^mk/build.mk$
+^mk/validate.mk$
+^mk/are-validating.mk$
 ^mk/config.h.in$
 ^mk/config.h$
 ^mk/config.mk$
 ^mk/stamp-h$
+^stage3.package.conf$
+^inplace-datadir(/|$)
 (^|/)autom4te.cache($|/)
 ^rts/AutoApply.*cmm$
+^rts/sm/Evac_thr.c$
+^rts/sm/Scav_thr.c$
 package.conf.inplace$
 package.conf.installed$
 (^|/)config.log$
@@ -163,49 +189,68 @@ package.conf.installed$
 (^|/)configure$
 ^ghc.spec$
 ^docs/users_guide/ug-book.xml$
-^extra-gcc-opts
+^docs/man/flags.xml$
+^docs/man/flags.xsl$
+^docs/man/ghc.1$
+^extra-gcc-opts$
 # ignore scripts like push-monk
-^push-*
+^push-
+^pull-
 # Common log file names; testlog is made by validate
 ^testlog
-^log*
-^utils/genapply/genapply
-^utils/genprimopcode/Lexer.hs
-^utils/genprimopcode/Parser.hs
-^utils/genprimopcode/genprimopcode
-^utils/ghc-pkg/Version.hs
-^utils/ghc-pkg/ghc-pkg-inplace
-^utils/ghc-pkg/ghc-pkg-inplace.hs
-^utils/ghc-pkg/ghc-pkg.bin
-^utils/hasktags/hasktags
-^utils/hp2ps/hp2ps
-^utils/hpc/HpcParser.hs
-^utils/hpc/hpc
-^utils/hsc2hs/hsc2hs-bin
-^utils/hsc2hs/hsc2hs-inplace
-^utils/hsc2hs/hsc2hs-inplace.hs
-^utils/lndir/lndir
-^utils/mkdependC/mkdependC
-^utils/mkdirhier/mkdirhier
-^utils/prof/cgprof/cgprof
-^utils/prof/ghcprof-inplace
-^utils/pwd/pwd
-^utils/runghc/runghc
-^utils/runstdtest/runstdtest
-^utils/unlit/unlit
-^driver/ghci/ghc-pkg-inplace
-^driver/mangler/ghc-asm
-^driver/mangler/ghc-asm.prl
-^driver/package.conf
-^driver/package.conf.inplace.old
-^driver/split/ghc-split
-^driver/split/ghc-split.prl
-^driver/stamp-pkg-conf-ghc
-^driver/stamp-pkg-conf-rts
-^includes/DerivedConstants.h
-^includes/GHCConstants.h
-^includes/ghcautoconf.h
-^includes/ghcplatform.h
-^includes/mkDerivedConstantsHdr
-^includes/mkGHCConstants
+^log
+^utils/[a-zA-Z0-9-]+/dist-install(/|$)
+^utils/[a-zA-Z0-9-]+/dist-inplace(/|$)
+^utils/[a-zA-Z0-9-]+/install-inplace(/|$)
+^compiler/Makefile-stage[1-3](/|$)
+^compiler/dist-stage[1-3](/|$)
+^ghc/dist-stage[1-3](/|$)
+^ghc/stage[1-3]-inplace(/|$)
+^utils/ext-core/Driver$
+^utils/ext-core/PrimEnv.hs$
+^utils/genapply/genapply$
+^utils/genprimopcode/Lexer.hs$
+^utils/genprimopcode/Parser.hs$
+^utils/genprimopcode/genprimopcode$
+^utils/ghc-pkg/Version.hs$
+^utils/ghc-pkg/ghc-pkg-inplace$
+^utils/ghc-pkg/ghc-pkg-inplace.bin$
+^utils/ghc-pkg/ghc-pkg-inplace.hs$
+^utils/ghc-pkg/ghc-pkg.bin$
+^utils/hasktags/hasktags$
+^utils/hasktags/hasktags-inplace$
+^utils/hp2ps/hp2ps$
+^utils/hpc/HpcParser.hs$
+^utils/hsc2hs(/|$)
+^utils/haddock(/|$)
+^utils/lndir/lndir$
+^utils/mkdependC/mkdependC$
+^utils/mkdirhier/mkdirhier$
+^utils/prof/cgprof/cgprof$
+^utils/prof/ghcprof-inplace$
+^utils/pwd/pwd$
+^utils/pwd/pwd-inplace$
+^utils/runghc/runghc$
+^utils/runghc/runghc-inplace$
+^utils/runghc/runhaskell$
+^utils/runstdtest/runstdtest$
+^utils/unlit/unlit$
+^driver/ghci/ghc-pkg-inplace$
+^driver/ghci/ghci-inplace$
+^driver/mangler/ghc-asm$
+^driver/mangler/ghc-asm.prl$
+^driver/package.conf$
+^driver/package.conf.inplace.old$
+^driver/split/ghc-split$
+^driver/split/ghc-split.prl$
+^driver/stamp-pkg-conf-rts$
+^includes/DerivedConstants.h$
+^includes/GHCConstants.h$
+^includes/ghcautoconf.h$
+^includes/ghcplatform.h$
+^includes/mkDerivedConstantsHdr$
+^includes/mkGHCConstants$
+^libffi/build($|/)
+^libffi/ffi.h$
+^libffi/stamp.ffi.static$