[MERGE][0.16] Regression fix for 'bzr status' after delete and rename

[Martin Pool]

Martin Pool has voted +1.
Status is now: Approved
Comment:
+        self.assertEqual([('b', 'a/b')], tree.move(['b'], 'a'))

I read this test and at first wondered "where does he move the file?" 
because I didn't expect assert* parameters to have side effects.  I 
realize it's perfectly safe because unlike the assert statement they 
always run, but just thought I'd mention it.

The fix looks reasonable to me.

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C462FDFCC.6060700%40arbash-meinel.com%3E