test_mutable.Update: remove .timeout overrides, otherwise tests ERROR

[tahoe-lafs/tahoe-lafs.git] / .darcs-boringfile

diff --git a/.darcs-boringfile b/.darcs-boringfile
index 77110e38ea095266e69288d9c432f0a64092925b..ca57fa9170a8bac775efff3904417a814673ca51 100644 (file)
--- a/.darcs-boringfile
+++ b/.darcs-boringfile
@@ -28,6 +28,8 @@
 (^|/)BitKeeper($|/)
 (^|/)ChangeSet($|/)
 (^|/)\.svn($|/)
+(^|/)\.git($|/)
+\.gitignore$
 \.py[co]$
 \#
 \.cvsignore$
@@ -36,28 +38,56 @@
 
 ^client-basedir
 ^queen-basedir($|/)
-^_trial_temp($|/)
+^_trial_temp.*($|/)
 ^\.buildbot($|/)
 ^MANIFEST$
 ^dist($|/)
 ^debian($|/)
 
-^(dapper|sid|feisty)/debian/allmydata
-^(dapper|sid|feisty)/debian/files$
+^misc/(dapper|sid|feisty)/debian/allmydata-tahoe($|/)
+^misc/(dapper|sid|feisty)/debian/allmydata-tahoe\.\w+\.debhelper$
+^misc/(dapper|sid|feisty)/debian/allmydata-tahoe\.substvars$
+^misc/(dapper|sid|feisty)/debian/files$
+
 ^build($|/)
 ^build-stamp$
 ^python-build-stamp-2.[45]$
-^\.figleaf$
+^\.coverage$
 ^coverage-html($|/)
 ^twisted/plugins/dropin\.cache$
-^\.figleaf\.el$
-^instdir($|/)
-^src/zfec/build($|/)
-^src/Crypto/build($|/)
+^\.coverage\.el$
 ^_test_memory($|/)
 
-# version.py is generated at build time, and never checked in
-^src/allmydata/version\.py$
+# _version.py is generated at build time, and never checked in
+^src/allmydata/_version\.py$
+# _appname.py is generated at build time, and never checked in
+^src/allmydata/_appname\.py$
+# src/allmydata/_auto_deps.py is copied into place at build time, and never checked in
+^src/allmydata/_auto_deps\.py$
+
+# bin/tahoe scripts (not including tahoe-script.template) are generated files
+^bin/tahoe$
+^bin/tahoe\.pyscript$
+^bin/tahoe-script\.py$
+
+# this file is maintained by the buildbot
+^\.buildbot-sourcedata$
+
+# automatically-built dependencies (using the 'build-deps' target) go here
+^support
+
+# creating a tahoe egg puts files here
+allmydata_tahoe.egg-info$
+^Twisted-.*\.egg/
+
+# zipped .eggs are boring, contents of .egg directories are not
+^.*\.egg$
+
+^\.checked-deps$
+^\.built$
+
+^misc/dependencies/build($|/)
+^misc/dependencies/temp($|/)
 
-^src/foolscap/build($|/)
-^src/zfec/zfec.egg-info($|/)
+^tahoe-deps($|/)
+^tahoe-deps\.tar\.gz$