Error during merge: No final name for trans_id 'new-70'

[Aaron Bentley]

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

On 12-09-17 04:04 PM, David Engster wrote:
> bzr: ERROR: No final name for trans_id 'new-70' file-id: None root 
> trans-id: 'new-0'
> 
> The offending commit in 'trunk' which is causing this error is
> rev. 8235, which is a very large merge from another branch and
> which surely leads to a criss-cross with many conflicts, but I
> cannot do anything about that now, hence I'd appreciate any hints
> on how to deal with this error.

With the aid of pdb, I determined that new-70 refers to the parent
directory of awk.wy.  In trunk, awk.wy was moved into
./obsolete/lisp/cedet/semantic/wisent/ but in to-emacs, that directory
was deleted.

You can fix this by restoring obsolete/lisp/cedet/semantic/wisent,
which you can do like so:

bzr revert -r 8184 obsolete/lisp/cedet/semantic/wisent/
bzr resolve --all
bzr commit -m "Restored directory"

Merge will then work, and you can delete the directory afterward.

The error you are getting is a bug in bzr.  This situation should
produce a conflict, not an error.

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

iEYEARECAAYFAlBXs/cACgkQ0F+nu1YWqI2OrACfS0ZnLkAPhKlSv5ztMIx2nWyt
LmQAn1bl7Krtu6SnDT31xWYiCDd9ZCwK
=VfSf
-----END PGP SIGNATURE-----