update on stack merging

[Martin Pool]

Here are some incremental patches to fix some of the tests.  One of
them I'm quite confident in, the other is a bit of a workaround for
not being clear how to test it or what was intended, as the comment
says.


-- 
Martin <http://launchpad.net/~mbp/>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 20080708-stacking-tests.diff
Type: text/x-diff
Size: 3008 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080708/e386bb5a/attachment.bin