← 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: Martin Pool
  • Date: 2009-12-22 06:18:02 UTC
  • mto: This revision was merged to the branch mainline in revision 4923.
  • Revision ID: mbp@sourcefrog.net-20091222061802-rsf625zh4b1jeou7
Check tree parent revision after update -r

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_update.py
263
263
''')
264
264
        self.failUnlessExists('./file1')
265
265
        self.failIfExists('./file2')
266
 
        # hrm - the below doesn't look correct for all formats...
267
 
        #self.check_file_contents('.bzr/checkout/last-revision',
268
 
        #                         'm1')
269
 
        # XXX: Should check last tree version.
 
266
        self.assertEquals(['m1'], master.get_parent_ids())
270
267
 
271
268
    def test_update_dash_r_outside_history(self):
272
269
        # Test that 'bzr update' works correctly when you have