[merge]problems with committing merges in a dirstate tree with a symlink

[John Arbash Meinel]

John Arbash Meinel has voted +1 (conditional).
Status is now: Semi-approved
Comment:
I just read the IRC commentary, and I see that addCleanup() doesn't 
clear out its list during tearDown(). That may be an easier fix than 
trying to prevent it from calling tearDown 2 times.


For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C20070312033624.GC4419%40cyclops.localdomain%3E