merge-upstreams adds and removes files instead of modifying them
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
bzr-builddeb |
Incomplete
|
Undecided
|
Unassigned |
Bug Description
I'm running bzr-builddeb 2.6 on Debian unstable. My upstream branch is lp:ooo-thumbnailer, and my packaging branch is lp:~flimm/ooo-thumbnailer/debian.
merge-upstream deleted some files and then added them again, instead of just modifying them in place.
Running this command gives me the following output:
bzr merge-upstream ../ooo-
Using distribution unstable
Committing to: /home/david/
added AUTHORS
deleted AUTHORS
added COPYING
deleted COPYING
modified MANIFEST.in
modified NEWS
modified PKG-INFO
added README
deleted README
added ooo-thumbnailer
deleted ooo-thumbnailer
added ooo-thumbnailer
deleted ooo-thumbnailer
added setup.py
deleted setup.py
deleted test/files
deleted test/files/COPYING
deleted test/files/Calc 1 Large.SXC
deleted test/files/Calc 1 template Large.STC
deleted test/files/Calc Large.ODS
deleted test/files/Calc template Large.OTS
deleted test/files/Draw 1 Large.SXD
deleted test/files/Draw 1 template Large.STD
deleted test/files/Draw Large.ODG
deleted test/files/Draw template Large.OTG
deleted test/files/Excel 2003 Large with thumbnail.XLS
deleted test/files/Excel 2003 Large without thumbnail.XLS
deleted test/files/Excel 2003 Small with thumbnail.XLS
deleted test/files/Excel 2003 Small without thumbnail.XLS
deleted test/files/Excel 2007 Large with thumbnail.XLSX
deleted test/files/Excel 2007 Large without thumbnail.XLSX
deleted test/files/Excel 2007 Small with thumbnail.XLSX
deleted test/files/Excel 2007 Small without thumbnail.XLSX
deleted test/files/Impress 1 Large.SXI
deleted test/files/Impress 1 template Large.STI
deleted test/files/Impress Large.ODP
deleted test/files/Impress template Large.OTP
deleted test/files/Math 1 Small.SXM
deleted test/files/Math Small.ODF
deleted test/files/
deleted test/files/
deleted test/files/
deleted test/files/
deleted test/files/Word 2003 Large with thumbnail.DOC
deleted test/files/Word 2003 Large without thumbnail.DOC
deleted test/files/Word 2003 Small with thumbnail.DOC
deleted test/files/Word 2003 Small without thumbnail.DOC
deleted test/files/Word 2007 Large with thumbnail.DOCX
deleted test/files/Word 2007 Large without thumbnail.DOCX
deleted test/files/Word 2007 Small with thumbnail.DOCX
deleted test/files/Word 2007 Small without thumbnail.DOCX
deleted test/files/Writer 1 Large.SXW
deleted test/files/Writer 1 master Large.SXG
deleted test/files/Writer 1 template Large.STW
deleted test/files/Writer Large.ODT
deleted test/files/Writer master Large.ODM
deleted test/files/Writer template Large.OTT
Committed revision 5.
All changes applied successfully.
The new upstream version has been imported.
You should now review the changes and then commit.
description: | updated |
Changed in bzr-builddeb: | |
status: | New → Opinion |
status: | Opinion → Incomplete |
Was the original packaging branch based on the upstream branch?