← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test__dirstate_helpers.py

  • Committer: James Westby
  • Date: 2009-03-12 03:03:59 UTC
  • mfrom: (4119.2.1 bzr.dev)
  • mto: This revision was merged to the branch mainline in revision 4124.
  • Revision ID: james.westby@canonical.com-20090312030359-ishfh5p46t2isl1n
Merge 1.13 back to trunk, and move new things in bzr.dev to top of NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test__dirstate_helpers.py
1020
1020
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1021
1021
                         state._dirblock_state)
1022
1022
 
 
1023
    def test_update_entry_tree_reference(self):
 
1024
        self.set_update_entry()
 
1025
        state = test_dirstate.InstrumentedDirState.initialize('dirstate')
 
1026
        self.addCleanup(state.unlock)
 
1027
        state.add('r', 'r-id', 'tree-reference', None, '')
 
1028
        self.build_tree(['r/'])
 
1029
        entry = state._get_entry(0, path_utf8='r')
 
1030
        self.do_update_entry(state, entry, 'r')
 
1031
        entry = state._get_entry(0, path_utf8='r')
 
1032
        self.assertEqual('t', entry[1][0][0])
 
1033
 
1023
1034
    def create_and_test_file(self, state, entry):
1024
1035
        """Create a file at 'a' and verify the state finds it during update.
1025
1036