Excess data size for a single revision

[Stefan Monnier]

> Could you please suggest a better way, if it exists, of doing this?

There is no better way!

Think about it:

if the patch really was already applied (and assuming "bzr merge"
doesn't end up generating spurious conflicts), then

   cd trunk
   bzr merge ../other-branch
   bzr revert .
   bzr commit -m "Merge but ignore the copyright changes"

will do the same as

   cd trunk
   bzr merge ../other-branch
   bzr commit -m "Merge but ignore the copyright changes"

because after "bzr merge" there will be no local changes.


        Stefan