Comment 6 for bug 377261
Revision history for this message
| John A Meinel (jameinel) wrote Re: [Bug 377261] Re: "AssertionError: name u'COMPILING' already in parent" in _generate_inventory when running "bzr update" | #6 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 2/28/2011 2:19 PM, Adrian Wilkins wrote:
> I'm getting this when resolving conflicts.
>
> In the case where a merged revision has added a file with the same name
> and moved the original out of the way. If you manually delete the new
> file and revert the old one back into place, then you get this error.
> The workaround is to revert the NEW file, which puts things back AND
> resolves the conflict.
>
> # wrong way
> rm V3TemplateXMLHa
> bzr revert V3TemplateXMLHa
> bzr resolved V3TemplateXMLHa
>
> bzr inventory
>
> bzr: ERROR: exceptions.
> already in parent
This definitely seems like a bug. Reverting the .moved file should end
up forcibly removing the old version.
Although yes, "bzr revert V3TemplateXMLHa
way to restore the old content to the original location.
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAk1
tOYAnR7TmvhNXdu
=cn1B
-----END PGP SIGNATURE-----