← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge bzr.dev to resolve news conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_dpush.py
104
104
 
105
105
        script.run_script(self, '''
106
106
            $ bzr dpush -d dc d
 
107
            2>Pushed up to revision 2.
107
108
            $ bzr revno dc
108
109
            2
109
110
            $ bzr status dc
121
122
        self.build_tree_contents([("dc/foofile", "blaaaal")])
122
123
        script.run_script(self, '''
123
124
            $ bzr dpush -d dc d --no-strict
 
125
            2>Pushed up to revision 2.
124
126
            ''')
125
127
        self.assertFileEqual("blaaaal", "dc/foofile")
126
128
        # if the dummy vcs wasn't that dummy we could uncomment the line below