Merge lp:~camptocamp/ocb-server/6.1-leaner-bzrignore-lep into lp:ocb-server/6.1

Proposed by Leonardo Pistone
Status: Rejected
Rejected by: Pedro Manuel Baeza
Proposed branch: lp:~camptocamp/ocb-server/6.1-leaner-bzrignore-lep
Merge into: lp:ocb-server/6.1
Diff against target: 11 lines (+0/-3)
1 file modified
.bzrignore (+0/-3)
To merge this branch: bzr merge lp:~camptocamp/ocb-server/6.1-leaner-bzrignore-lep
Reviewer Review Type Date Requested Status
Holger Brunn (Therp) Disapprove
Sandy Carter ( Disapprove
Review via email:
To post a comment you must log in.
Revision history for this message
Sandy Carter ( (sandy-carter) wrote :

I disagree with taking out .swp files.
Having .swp in the ignore file means that we would never want that kind of file tracked.
I suggest using a different method to track swp files such as:
bzr ignored | grep .swp

review: Disapprove
Revision history for this message
Leonardo Pistone (lepistone) wrote :


1. Do you think there is a use case where you want to have .swp files around but you want "bzr status" to tell you all is good and clean?

2. What do you think about the other two removals? I'm happy to remove only what we find an agreement on.


Revision history for this message
Sandy Carter ( (sandy-carter) wrote :

1. Sorry to put it bluntly, but if someone loses track of her .swp file, it's her own problem
If someone accidentally commits a .swp file he had lying around, it becomes everyone's problem.
Look at any project, .swp is standard for .*ignore files, as are *~.
Having editor specific files pollute our bzr statuses, in my opinion affects more people than those who find it useful to see it.

2. I am ok with taking out .bzrignore, but that's it. I can see the point (though I don't see it particularity well thought out) in ignoring new files from openerp/addons/ as there shouldn't be any new ones and changes to files in there will still be tracked.

This looks like a pointless divergence from mainline OE, hence the disapproval.

Revision history for this message
Holger Brunn (Therp) (hbrunn) wrote :

agreed with Sandy's points

review: Disapprove

Unmerged revisions

4328. By Leonardo Pistone

[fix] do not ignore:

- openerp/addons/* (lots of real code there)
- .bzrignore (users should use local ignore, not silently add here),
- *.swp (if an editor crashed, or I forgot to save, I expect bzr to tell me that the tree is not clean).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2012-02-01 13:09:57 +0000
3+++ .bzrignore 2014-03-17 11:33:19 +0000
4@@ -1,7 +1,4 @@
5 *.pyc
9 openerp/filestore*
10 .Python
11 include


People subscribed via source and target branches

to status/vote changes: