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 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Holger Brunn (Therp) | Disapprove | ||
Sandy Carter (http://www.savoirfairelinux.com) | Disapprove | ||
Review via email: mp+211288@code.launchpad.net |
To post a comment you must log in.
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).
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