← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_revert.py

  • Committer: John Arbash Meinel
  • Date: 2009-09-02 13:32:52 UTC
  • mfrom: (4634.6.14 2.0)
  • mto: (4634.6.15 2.0)
  • mto: This revision was merged to the branch mainline in revision 4667.
  • Revision ID: john@arbash-meinel.com-20090902133252-t2t94xtckoliv2th
Merge lp:bzr/2.0 to resolve NEWS issues.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_revert.py
96
96
        self.failUnlessExists('a/b')
97
97
        self.failUnlessExists('a/d')
98
98
        self.failIfExists('a/g')
99
 
        self.failUnlessExists('j')
 
99
        self.expectFailure(
 
100
            "j is in the delta revert applies because j was renamed too",
 
101
            self.failUnlessExists, 'j')
100
102
        self.failUnlessExists('h')
101
103
        self.run_bzr('revert f')
102
104
        self.failIfExists('j')