/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/selftest/test_merge_core.py

  • Committer: Aaron Bentley
  • Date: 2005-09-19 02:33:09 UTC
  • mfrom: (1185.3.27)
  • mto: (1185.1.29)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: aaron.bentley@utoronto.ca-20050919023309-24e8871f7f8b31cf
Merged latest from mpool

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_merge_core.py
475
475
        from bzrlib.merge import merge
476
476
        # John starts a branch
477
477
        self.build_tree(("original/", "original/file1", "original/file2"))
478
 
        branch = Branch("original", init=True)
 
478
        branch = Branch.initialize("original")
479
479
        smart_add_branch(branch, ["original"], True, add_reporter_null)
480
480
        branch.commit("start branch.", verbose=False)
481
481
        # Mary branches it.
487
487
        file.close()
488
488
        branch.commit("change file1")
489
489
        # Mary does too
490
 
        mary_branch = Branch("mary")
 
490
        mary_branch = Branch.open("mary")
491
491
        file = open("mary/file2", "wt")
492
492
        file.write("Mary\n")
493
493
        file.close()