Pushing commits on top of ones with "weird" manifests fail

[glandium]

STR:

• Take a clone of the octave or pypy repositories.
• Checkout a revision that has a manifest with a leading / or an embedded //.
• Create a commit on top of this
• Push or bundle.

This fails with:

  File "bundle.py", line 251, in create_hg_manifest
    sha1_after, str(manifest_line.node),
AttributeError: 'tuple' object has no attribute 'node'

and

  File "bundle.py", line 162, in create_hg_manifest
    path, f, (change, (manifest_line_p1, manifest_line_p2)) = line
ValueError: need more than 0 values to unpack

for merges

[glandium]

Recent STR:

• git clone hg::https://hg.savannah.gnu.org/hgweb/octave/
• cd octave
• git checkout 022cd38197d66a4079fc96f9ba15a3d5af68bda0
• echo >> gui/Changelog
• git commit -a -m foo
• git cinnabar bundle foo.hg HEAD^!

Error message is now:

fatal: Something went wrong Right(Modified { from: RecursedTreeEntry { oid: Blob(BlobId("291a3ff9337e51f702594128b9cda29d7e85ea3c")), mode: 100644 }, to: RecursedTreeEntry { oid: Blob(BlobId("4e69ccae0b7c24fb09553e2ed4d0f45b6d20ed82")), mode: 100644 } })

from https://github.com/glandium/git-cinnabar/blob/415d64c8e6abff519d7565895eafd145569d4d91/src/main.rs#L2052