← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Gerard Krol
  • Date: 2010-01-31 14:29:50 UTC
  • mto: (5020.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: gerard_@gna.org-20100131142950-uob5vch5h34yl7e2
Reverting some unneeded changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_update.py
250
250
        self.build_tree(['./file2'])
251
251
        master.add(['file2'])
252
252
        master.commit('two', rev_id='m2')
253
 
        
254
 
        self.run_bzr('update -r 1')
255
253
 
256
 
#        sr = ScriptRunner()
257
 
#        sr.run_script(self, '''
258
 
#$ bzr update -r 1
259
 
#2>-D  file2
260
 
#2>All changes applied successfully.
261
 
#2>Updated to revision 1 of .../master
262
 
#''')
 
254
        sr = ScriptRunner()
 
255
        sr.run_script(self, '''
 
256
$ bzr update -r 1
 
257
2>-D  file2
 
258
2>All changes applied successfully.
 
259
2>Updated to revision 1 of .../master
 
260
''')
263
261
        self.failUnlessExists('./file1')
264
262
        self.failIfExists('./file2')
265
263
        self.assertEquals(['m1'], master.get_parent_ids())