merge-upstreams adds and removes files instead of modifying them

[David D Lowe]

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-thumbnailer_0.4.1.orig.tar.gz ../ooo-thumbnailer --version 0.4.1 --revision tag:0.4.1
Using distribution unstable
Committing to: /home/david/Programming/tmpF7X1km/upstream/
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.schemas
deleted ooo-thumbnailer.schemas
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/PowerPoint 2003 Large.PPT
deleted test/files/PowerPoint 2003 Small.PPT
deleted test/files/PowerPoint 2007 Large.PPTX
deleted test/files/PowerPoint 2007 Small.PPTX
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.

[Jelmer Vernooij (jelmer)]

Was the original packaging branch based on the upstream branch?

[David D Lowe (flimm)]

No, I followed the documentation for "normal mode" and did something similar to:
bzr init packaging-branch
cd packaging-branch
bzr merge-upstream ...

[Jelmer Vernooij (jelmer)]

On Tue, Feb 01, 2011 at 10:15:16AM -0000, David D Lowe wrote:
> No, I followed the documentation for "normal mode" and did something similar to:
> bzr init packaging-branch
> cd packaging-branch
> bzr merge-upstream ...
What did you (or whoever worked on this package prior) use to merge the
previous upstream though, or is that what you mean?

If the previous upstream wasn't merged without the branch specified then that
could have caused the file ids to change. It's a different (known) bug.

Cheers,

Jelmer

[Jelmer Vernooij (jelmer)]

Perhaps a dupe of bug 528746?