bzr: ERROR: No final name for trans_id 'new-26'

Bug #1179527 reported by Frits Jalvingh
This bug affects 1 person
Affects Status Importance Assigned to Milestone

Bug Description

When merging two normal, related branches the merge fails with:

bzr: ERROR: No final name for trans_id 'new-26'
file-id: None
root trans-id: 'new-0'

The bug looks a lot like the one reported in 364305, but the branches this occurs on now are completely "normal": they are both coming from a common base, and the common base is merged regularly.

In this case the merge is a nasty one because it is a merge of two large projects, so it results in a lot of conflicts. But the error aborts the real merge, so the net result after the error is an unchanged workspace.

I do not know a workaround, and this is quite a big problem now since we cannot continue work on our project 8-/

Revision history for this message
John A Meinel (jameinel) wrote :

I don't have an immediate answer, but you might check for a file that is deleted out of a directory which is also deleted.
Or possibly the reverse, a directory which is deleted in the source branch, but has an extra file in the target branch.

The fact that file-id is None, indicates it thinks it is talking about an unversioned file.

You might also try doing "bzr clean-tree [--ignored]" to clear out any unversioned files.

Jelmer Vernooij (jelmer)
tags: added: check-for-breezy
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers