/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_missing.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/test_missing.py
17
17
import os
18
18
 
19
19
 
20
 
from bzrlib.builtins import merge
21
20
from bzrlib.missing import (
22
21
    find_unmerged,
23
22
    iter_log_data,
52
51
        self.assertEqual(find_unmerged(original, puller), ([], []))
53
52
        self.assertEqual(find_unmerged(original, merger), ([(2, u'b'), 
54
53
                                                            (3, u'c')], []))
55
 
        merge(['original', -1], [None, None], this_dir='merger')
 
54
        merger_tree.merge_from_branch(original)
56
55
        self.assertEqual(find_unmerged(original, merger), ([(2, u'b'), 
57
56
                                                            (3, u'c')], []))
58
57
        merger_tree.commit('d', rev_id='d')