.bzrignore files stripped
Bug #496907 reported by
Robert Collins
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| bzr-builddeb |
Fix Released
|
Wishlist
|
Robert Collins | ||
Bug Description
My upstream tarball has .bzrignore included, but 'bzr merge-upstream'
deletes the .bzrignore file from my tree. This isn't what I want it to
do, and forces manual fixups of 'merge-upstream'.
affects bzr-builddeb
Related branches
lp:~lifeless/bzr-builddeb/trunk
- Bzr-builddeb-hackers: Pending requested
-
Diff: 268 lines (+183/-27)4 files modifiedbzrtools_import.py (+32/-21)
debian/changelog (+7/-0)
dh_make.py (+10/-1)
tests/blackbox/test_merge_upstream.py (+134/-5)
- James Westby: Approve
-
Diff: 473 lines (+64/-53)7 files modifiedbuilder.py (+5/-5)
changes.py (+1/-1)
cmds.py (+19/-19)
directory.py (+5/-5)
hooks.py (+2/-2)
import_dsc.py (+16/-5)
upstream.py (+16/-16)
Revision history for this message
| Robert Collins (lifeless) wrote | #1 |
| Changed in bzr-builddeb: | |
| status: | New → Confirmed |
| importance: | Undecided → Wishlist |
| assignee: | nobody → Robert Collins (lifeless) |
| Changed in bzr-builddeb: | |
| status: | Confirmed → Fix Committed |
| Changed in bzr-builddeb: | |
| status: | Fix Committed → Fix Released |
To post a comment you must log in.
Chatted with james on IRC; confirmed this is ok to change.