Merge lp://staging/~jelmer/bzr-builddeb/move-config-to-debian-dir into lp://staging/bzr-builddeb
Proposed by
Jelmer Vernooij
| Status: | Superseded | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~jelmer/bzr-builddeb/move-config-to-debian-dir | ||||
| Merge into: | lp://staging/bzr-builddeb | ||||
| Diff against target: |
345 lines (+76/-59) (has conflicts) 11 files modified
__init__.py (+2/-0) config.py (+3/-1) debian/changelog (+6/-0) doc/user_manual/configuration.rst (+3/-2) doc/user_manual/hooks.rst (+1/-1) doc/user_manual/merge.rst (+3/-4) doc/user_manual/native.rst (+3/-4) doc/user_manual/split.rst (+3/-3) import_dsc.py (+34/-36) tests/test_import_dsc.py (+5/-7) util.py (+13/-1) Text conflict in debian/changelog |
||||
| To merge this branch: | bzr merge lp://staging/~jelmer/bzr-builddeb/move-config-to-debian-dir | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Bzr-builddeb-hackers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2011-10-11.
Description of the change
Move versioned configuration to debian/
To post a comment you must log in.
Revision history for this message
| James Westby (james-w) wrote | # |
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
241 if needs_add:
242 os.mkdir(dirname)
It looks like that would still create .bzr-builddeb?
Also, what do you think about moving local.conf as discussed on IRC?
Thanks,
James