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

[Andreas Hasenack]

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

On 03/29/2012 11:07 AM, Jelmer Vernooij wrote:
>> I think Andreas was asking about a way to just export the tarball
>> and use it in merge-upstream without also merging the branch.
> Aha. I guess you could always use something like this:
> 
> bzr export -d <upstream-branch> foo-0.1.tar.gz bzr merge-upsteam
> foo-0.1.tar.gz


fwiw, now I just go to <branch>, bzr export /tmp/some-tarball.tar.gz
and then do bzr merge-upstream /tmp/some-tarball.tar.gz in the ubuntu
branch.



- -- 
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/

iEYEARECAAYFAk90s7YACgkQeEJZs/PdwpAJOACfWb29ksWcyS1QI1yI03YJkvyz
5S4AoN4grNKQb10lZcKkt6Hzf+5Nvl4x
=XzPo
-----END PGP SIGNATURE-----