[MERGE REVIEW] revert behaves properly in checkouts

[Martin Pool]

On 8 Mar 2006, at 18:27 , Aaron Bentley wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> This test ensures that your basic 'bzr revert' works properly in a
> checkout, though bzr revert -1 will still interpret the -1 in terms of
> the branch.
>

> === modified file 'a/bzrlib/tests/blackbox/test_revert.py'
> --- a/bzrlib/tests/blackbox/test_revert.py	
> +++ b/bzrlib/tests/blackbox/test_revert.py	
> @@ -61,3 +61,14 @@
>          # test case for bug #29424:
>          # revert to specific revision for file in subdir does not  
> work
>          self.helper('-r 1')
> +
> +    def test_revert_in_checkout(self):
> +        os.mkdir('brach')
> +        os.chdir('brach')
> +        self._prepare_tree()
> +        self.runbzr('checkout --lightweight . ../sprach')
> +        self.runbzr('commit -m more')
> +        os.chdir('../sprach')
> +        self.assertEqual('', self.capture('status'))
> +        self.runbzr('revert')
> +        self.assertEqual('', self.capture('status'))

It might be nice to also check the bzr revno output?  Anyhow +1.

-- 
Martin Pool