SFTP: add a comment about a subtle interaction between OverwriteableFileConsumer...

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

diff --git a/.darcs-boringfile b/.darcs-boringfile
index 908d6c08b839ea4271fa9102963519153fd775ac..ca57fa9170a8bac775efff3904417a814673ca51 100644 (file)
--- a/.darcs-boringfile
+++ b/.darcs-boringfile
@@ -38,7 +38,7 @@
 
 ^client-basedir
 ^queen-basedir($|/)
-^_trial_temp($|/)
+^_trial_temp.*($|/)
 ^\.buildbot($|/)
 ^MANIFEST$
 ^dist($|/)
@@ -65,30 +65,27 @@
 # src/allmydata/_auto_deps.py is copied into place at build time, and never checked in
 ^src/allmydata/_auto_deps\.py$
 
-# bin/tahoe and bin/tahoe-script.py are now generated files
+# 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-build dependencies (using the 'build-deps' target) go here
+# automatically-built dependencies (using the 'build-deps' target) go here
 ^support
-# if ez_setup.py needs to build setuptools, that goes here
-^setuptools-.*.egg$
+
 # creating a tahoe egg puts files here
 allmydata_tahoe.egg-info$
-^Twisted-.*.egg($|/)
+^Twisted-.*\.egg/
+
+# zipped .eggs are boring, contents of .egg directories are not
+^.*\.egg$
 
 ^\.checked-deps$
 ^\.built$
 
-# if setup.py needs to install plugins from eggs to satisfy setup_requires:
-^setuptools_trial.*.egg$
-^setuptools_darcs.*.egg$
-^darcsver.*.egg$
-^pyutil.*.egg$
-
 ^misc/dependencies/build($|/)
 ^misc/dependencies/temp($|/)