dolfin team mailing list archive

[Joachim B Haga <jobh@xxxxxxxxxxxx>]

Johan Hake <hake@xxxxxxxxx> writes:

> Am I the only one that get import leak from assemble.py? 
[...]
> I have attached a patch to assemble.py that fixes this on my system.

This was caused by a mis-merge (48578c84dd2f, "updated io to require
GenericMatrix") which removed the lines you added back here.

What I don't understand is how this happened. assemble.py should have been a
straightforward automatic merge (changed in one parent, unchanged in
other). Was there something special about how that merge was done, or is the hg
conflict resolution wobbly?

-j.