bzr merge-upstream: why delete and add the same unchanged file?

[Andreas Hasenack]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

I'm experimenting with bzr merge-upstream and found what I think is an
odd behavior. I'm probably just using it incorrectly, but I can't find
out what I'm doing wrong.

I'm merging lp:landscape-client into ubuntu:landscape-client. Let's
say I'm preparing a new release.

This is the command-line:
$ bzr merge-upstream ~/canonical/source/landscape-client/trunk/
- --revision 531 --version 12.04.1

(~/canonical/source/landscape-client/trunk has lp:landscape-client)

https://pastebin.canonical.com/62652/ is the output

There are some conflicts, but I'm not worried about those for now
(unless they explain what I'm seeing).

This is my question:

$ bzr st LICENSE
removed:
  LICENSE
added:
  LICENSE

This happened to *all* files. There is not a single "modified" file in
the bzr status output.

Why is it removing and adding the same file? This file (and several
others) didn't change between ubuntu:landscape-client and
lp:landscape-client, it's exactly the same.

- -- 
Andreas Hasenack
andreas at canonical.com

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk9o2HwACgkQeEJZs/PdwpAqZwCgz+1yIZ1RR/sk/8oIlm9Er3Bz
olUAnAplPNp85e9gDO+FrgbF/1Nd1Xsk
=UnwB
-----END PGP SIGNATURE-----