/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2008-05-29 20:17:37 UTC
  • mto: This revision was merged to the branch mainline in revision 3460.
  • Revision ID: john@arbash-meinel.com-20080529201737-4y4md0w6u6cuvrpo
Clarity tweaks recommended by Ian

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_update.py
104
104
        tree1.branch.update_revisions(tree2.branch, overwrite=True)
105
105
        self.assertEqual((2, rev2b), tree1.branch.last_revision_info())
106
106
 
107
 
    def test_ignores_older(self):
 
107
    def test_ignores_older_unless_overwrite(self):
108
108
        tree1 = self.make_branch_and_tree('tree1')
109
109
        rev1 = tree1.commit('one')
110
110
        tree2 = tree1.bzrdir.sprout('tree2').open_workingtree()