← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_changeset.py

  • Committer: Aaron Bentley
  • Date: 2006-05-22 06:22:50 UTC
  • mto: This revision was merged to the branch mainline in revision 1738.
  • Revision ID: aaron.bentley@utoronto.ca-20060522062250-743727f207503374
Add test for last-changed special cases

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_changeset.py
598
598
        tt.apply()
599
599
        self.tree1.commit('just modify binary', rev_id='b@cset-0-4')
600
600
        self.get_valid_cset('b@cset-0-3', 'b@cset-0-4')
 
601
 
 
602
    def test_last_modified(self):
 
603
        self.tree1 = BzrDir.create_standalone_workingtree('b1')
 
604
        self.b1 = self.tree1.branch
 
605
        tt = TreeTransform(self.tree1)
 
606
        tt.new_file('file', tt.root, 'file', 'file')
 
607
        tt.apply()
 
608
        self.tree1.commit('create file', rev_id='a@lmod-0-1')
 
609
 
 
610
        tt = TreeTransform(self.tree1)
 
611
        trans_id = tt.trans_id_tree_file_id('file')
 
612
        tt.delete_contents(trans_id)
 
613
        tt.create_file('file2', trans_id)
 
614
        tt.apply()
 
615
        self.tree1.commit('modify text', rev_id='a@lmod-0-2a')
 
616
 
 
617
        other = self.get_checkout('a@lmod-0-1')
 
618
        tt = TreeTransform(other)
 
619
        trans_id = tt.trans_id_tree_file_id('file')
 
620
        tt.delete_contents(trans_id)
 
621
        tt.create_file('file2', trans_id)
 
622
        tt.apply()
 
623
        other.commit('modify text in another tree', rev_id='a@lmod-0-2b')
 
624
        merge([other.basedir, -1], [None, None], this_dir=self.tree1.basedir)
 
625
        self.tree1.commit(u'Merge', rev_id='a@lmod-0-3',
 
626
                          verbose=False)
 
627
        self.tree1.commit(u'Merge', rev_id='a@lmod-0-4')
 
628
        cset = self.get_valid_cset('a@lmod-0-2', 'a@lmod-0-4')