Rev 5416: (mbp) ignore __pycache__ by default (Andrea Corbellini) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5416 [merge]
revision-id: pqm at pqm.ubuntu.com-20100909055126-qwo256ldpnz7o0c4
parent: pqm at pqm.ubuntu.com-20100909043241-7ya6s3ghs5c1ijxk
parent: corbellini.andrea at gmail.com-20100908084906-e0nz132f4h54e2uw
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2010-09-09 06:51:26 +0100
message:
  (mbp) ignore __pycache__ by default (Andrea Corbellini)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/ignores.py              ignores.py-20060712153832-2von9l0t7p43ixsv-1
  doc/en/whats-new/whats-new-in-2.3.txt whatsnewin2.3.txt-20100818072501-x2h25r7jbnknvy30-1
=== modified file 'NEWS'
--- a/NEWS	2010-09-09 00:32:58 +0000
+++ b/NEWS	2010-09-09 05:51:26 +0000
@@ -207,6 +207,10 @@
   content faster than seeking and reading content from another tree,
   especially in cold-cache situations. (John Arbash Meinel, #607298)
 
+* Add ``__pycache__`` to the default ``ignores`` file. Future releases of
+  Python will use this directory to store bytecodes.
+  (Andrea Corbellini, #626687)
+
 Documentation
 *************
 

=== modified file 'bzrlib/ignores.py'
--- a/bzrlib/ignores.py	2010-08-25 10:20:41 +0000
+++ b/bzrlib/ignores.py	2010-09-04 15:34:10 +0000
@@ -41,6 +41,7 @@
     '*~',
     '.#*',
     '[#]*#',
+    '__pycache__',
 ]
 
 

=== modified file 'doc/en/whats-new/whats-new-in-2.3.txt'
--- a/doc/en/whats-new/whats-new-in-2.3.txt	2010-08-31 07:12:18 +0000
+++ b/doc/en/whats-new/whats-new-in-2.3.txt	2010-09-08 08:49:06 +0000
@@ -17,6 +17,14 @@
 2.1, and 2.2, and can read and write repositories generated by all
 previous versions.
 
+Changed Behaviour
+*****************
+
+* The default ``ignore`` file created by Bazaar will contain ``__pycache__``,
+  which is the name of the directory that will be used by Python to store
+  bytecode files.
+  (Andrea Corbellini, #626687)
+
 Launchpad integration
 *********************
 
@@ -32,7 +40,7 @@
   with many changes by not repeatedly building a list of all file-ids.
   (Andrew Bennetts)
 
-* ``bzr send`` uses less memory.  
+* ``bzr send`` uses less memory.
   (John Arbash Meinel, #614576)
 
 * Inventory entries now consume less memory (on 32-bit Ubuntu file entries