Merge lp:~rosslagerwall/bzr/bzrignore-locale into lp:bzr/2.5

Proposed by Ross Lagerwall on 2012-08-07
Status: Merged
Approved by: Martin Packman on 2012-08-10
Approved revision: 6507
Merged at revision: 6507
Proposed branch: lp:~rosslagerwall/bzr/bzrignore-locale
Merge into: lp:bzr/2.5
Diff against target: 11 lines (+1/-0)
1 file modified
.bzrignore (+1/-0)
To merge this branch: bzr merge lp:~rosslagerwall/bzr/bzrignore-locale
Reviewer Review Type Date Requested Status
Martin Packman (community) 2012-08-07 Approve on 2012-08-10
Review via email: mp+118496@code.launchpad.net

Commit message

Ignore bzrlib/locale directory created by build process

Description of the change

Since Bazaar 2.5, running ./setup.py build results in locale files being generated but these aren't in .bzrignore.

This adds them to .bzrignore.

To post a comment you must log in.
Martin Packman (gz) wrote :

See also bug 955314 and the related merge proposal.

Merging this now is harmless, but really bzr shouldn't be putting .mo files in the code tree unless told to. Making distutils do that without breaking the build process was hard though.

review: Approve
Martin Packman (gz) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2010-10-13 00:26:41 +0000
3+++ .bzrignore 2012-08-07 07:03:48 +0000
4@@ -25,6 +25,7 @@
5 # setup.py working directory
6 ./build
7 ./build-win32
8+./bzrlib/locale
9 # Editor temporary/working/backup files
10 *$
11 .*.sw[nop]

Subscribers

People subscribed via source and target branches