← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge bzr.dev to resolve news conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_filesystem_cicp.py
131
131
    def test_mv_newname(self):
132
132
        wt = self._make_mixed_case_tree()
133
133
        run_script(self, """
134
 
            $ bzr add
135
 
            $ bzr ci -m message
 
134
            $ bzr add -q
 
135
            $ bzr ci -qm message
136
136
            $ bzr mv camelcaseparent/camelcase camelcaseparent/NewCamelCase
137
137
            CamelCaseParent/CamelCase => CamelCaseParent/NewCamelCase
138
138
            """)
142
142
        # In this case we can specify the incorrect case for the destination,
143
143
        # as we use --after, so the file-system is sniffed.
144
144
        run_script(self, """
145
 
            $ bzr add 
146
 
            $ bzr ci -m message
 
145
            $ bzr add -q
 
146
            $ bzr ci -qm message
147
147
            $ mv CamelCaseParent/CamelCase CamelCaseParent/NewCamelCase
148
148
            $ bzr mv --after camelcaseparent/camelcase camelcaseparent/newcamelcase
149
149
            CamelCaseParent/CamelCase => CamelCaseParent/NewCamelCase