← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_ancestry.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-07-31 12:22:44 UTC
  • mfrom: (1551.15.77 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20070731122244-f1jemfecukeevugw
Clean up merge command, support arbitrary revisions

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ancestry.py
16
16
 
17
17
import os
18
18
 
19
 
from bzrlib.builtins import merge
20
19
from bzrlib.tests import TestCaseWithTransport
21
20
from bzrlib.workingtree import WorkingTree
22
21
from bzrlib.branch import Branch
35
34
        b_wt.commit('modified B/foo',rev_id='B1')
36
35
        open('A/foo', 'wb').write('000\n1111\n')
37
36
        a_wt.commit('modified A/foo',rev_id='A2')
38
 
        merge(['B',-1],['B',1],this_dir='A')
 
37
        a_wt.merge_from_branch(b_wt.branch, b_wt.last_revision(),
 
38
            b_wt.branch.get_rev_id(1))
39
39
        a_wt.commit('merged B into A',rev_id='A3')
40
40
 
41
41
    def _check_ancestry(self, location='', result=None):