← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge bzr.dev to resolve news conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_push.py
146
146
        b2 = branch.Branch.open('pushed-location')
147
147
        self.assertEndsWith(b2.base, 'pushed-location/')
148
148
 
 
149
    def test_push_no_tree(self):
 
150
        # bzr push --no-tree of a branch with working trees
 
151
        b = self.make_branch_and_tree('push-from')
 
152
        self.build_tree(['push-from/file'])
 
153
        b.add('file')
 
154
        b.commit('commit 1')
 
155
        out, err = self.run_bzr('push --no-tree -d push-from push-to')
 
156
        self.assertEqual('', out)
 
157
        self.assertEqual('Created new branch.\n', err)
 
158
        self.failIfExists('push-to/file')
 
159
 
149
160
    def test_push_new_branch_revision_count(self):
150
161
        # bzr push of a branch with revisions to a new location
151
162
        # should print the number of revisions equal to the length of the