Comment 11 for bug 364305

Revision history for this message
Frits Jalvingh (fjalvingh) wrote :

I added the following as debug test to final_name in transform.py:
    def final_name(self, trans_id):
        """Determine the final filename, after all changes are applied."""
        if trans_id == "new-1":
            self._tree_id_paths[trans_id] = ROOT_PARENT
            return ROOT_PARENT

(of course this is not a "fix")

This allows the merge to complete succesfully, and I can commit that change without problems. It seems like there's trouble locating a "target" for the source tree root? Should the 'transform' find a new location for a tree root somehow?