[MERGE] revert deletes files when it is safe

[John Arbash Meinel]

Aaron Bentley wrote:
> John Arbash Meinel wrote:

...

>>> self.build_tree_contents([('merge_target/new_file', new_contents')]))
>>>
>>> instead of the try/finally stuff. (As pointed out to me by Robert)
> 
> That is not a very intuitive way to achieve that, but okay.
> 

What would you prefer? We already have a common idiom of using
'self.build_tree([])' for creating a tree with arbitrary contents. So
'self.build_tree_contents([])' follows fairly logically that you do the
same operation, only now you pass the real contents in.

I *think* Robert is wanting to switch the tests over to MemoryTree where
possible. Which means he can change build_tree_contents() to work on a
Transport, and not have to actually write to disk for lots of tests.

Though now that I realize that, I want to ask Robert to give selftest a
flag to actually write to disk. As sometimes you need to do a
post-mortem. Which is impossible if everything is in RAM. (Mabye the
flag could be automatically set by using --keep-output).

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060927/2b982ddf/attachment.pgp