Hi all,
Look here:
http://bazaar.launchpad.net/~inkscape.dev/inkscape/experimental/changes
rev 13365
managed to 'rename' my earlier commit to include poppler in win64
build.
My recommendation to not waste too many brain cycles: don't merge.
You can create you own branch, fine, just don't merge it in. Just
create a separate trunk/experimental checkout and copy your changes
in, then commit.
Whatever you think about better workflows, it is paramount to
maintain a clean version history. And again and again, we have
proven that we are not capable of maintaining a clean history by
using bzr merge.
Thanks,
Johan