wierd merge bug

[Aaron Bentley]

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

Erik Bågfors wrote:
> 2006/3/9, Aaron Bentley <aaron.bentley at utoronto.ca>:
> 
>>-----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.
> 
> 
> I'm still learning python, what's the best way to dump? In perl I
> would use Data::Dumper::Dumper... what about python?

Well, repr() will produce decent output of a built-in type, but you'd
have to use it on the maps, not the TreeTransform object.

Aaron

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

iD8DBQFEEJy00F+nu1YWqI0RAg7KAJ9CzorLpvt5/eJ9vRvc0I9118ZJfwCfaO19
nB3cscFG2yFswq7VFGpSNlw=
=yRH8
-----END PGP SIGNATURE-----