wierd merge bug

[Aaron Bentley]

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

Erik Bågfors wrote:
> This is really annoying (and severe) and I can't seem to reproduce it
> *gaaaaahhhh*
> 
> Any hints?

Without the trees, the next best thing would be dumps of the
TreeTransform contents.  That would be:

        self._new_name = {}
        self._new_parent = {}
        self._new_contents = {}
        self._removed_contents = set()
        self._new_executability = {}
        self._new_id = {}
        self._non_present_ids = {}
        self._r_new_id = {}
        self._removed_id = set()
        self._tree_path_ids = {}
        self._tree_id_paths = {}

I'd need a dump from before and after the conflict resolution.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFEEJfJ0F+nu1YWqI0RAjyYAJ9VDRmHcz7J6E+cscQqi2ryOhN3mQCfak68
JM6eGLwi9GoBW3e1g0HoI/8=
=QHYA
-----END PGP SIGNATURE-----