← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_mv.py
77
77
 
78
78
    def test_mv_unqualified(self):
79
79
        self.run_bzr_error(['^bzr: ERROR: missing file argument$'], 'mv')
80
 
        
 
80
 
81
81
    def test_mv_invalid(self):
82
82
        tree = self.make_branch_and_tree('.')
83
83
        self.build_tree(['test.txt', 'sub1/'])
91
91
            ["^bzr: ERROR: Could not move test.txt => .*hello.txt: "
92
92
             "sub1 is not versioned\.$"],
93
93
            'mv test.txt sub1/hello.txt')
94
 
        
 
94
 
95
95
    def test_mv_dirs(self):
96
96
        tree = self.make_branch_and_tree('.')
97
97
        self.build_tree(['hello.txt', 'sub1/'])