← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_core.py

  • Committer: Erik Bagfors
  • Date: 2007-04-05 09:51:17 UTC
  • mfrom: (2401 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2439.
  • Revision ID: erik@bagfors.nu-20070405095117-ndglm72iuaxpi6u8
[merge] bzr.dev

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')