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

  • Committer: Martin Pool
  • Date: 2007-04-01 06:19:16 UTC
  • mfrom: (2323.5.20 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2390.
  • Revision ID: mbp@sourcefrog.net-20070401061916-plpgsxdf8g7gll9o
Merge 0.15 final release back to trunk, including: recommend upgrades of old workingtrees, handle multiple http redirections, some dirstate fixes, 

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_core.py
552
552
        a_wt = self.make_branch_and_tree('a')
553
553
        file('a/un','wb').write('UN')
554
554
        file('a/deux','wb').write('DEUX')
555
 
        a_wt.add('un', 'un')
556
 
        a_wt.add('deux', 'deux')
 
555
        a_wt.add('un', 'un-id')
 
556
        a_wt.add('deux', 'deux-id')
557
557
        a_wt.commit('r0', rev_id='r0')
558
558
        self.run_bzr('branch', 'a', 'b')
559
559
        b_wt = WorkingTree.open('b')