← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin von Gagern
  • Date: 2011-06-01 12:53:56 UTC
  • mto: This revision was merged to the branch mainline in revision 6009.
  • Revision ID: martin.vgagern@gmx.net-20110601125356-lwozv2vecea6hxfz
Change from no_decorate to classify as name for the argument.

The command line switch remains as --no-classify, to keep backwards
compatibility.  Users are free to include --no-classify in an alias, and
still use --classify to change back.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
34
34
    urlutils,
35
35
    workingtree,
36
36
    )
37
 
from bzrlib.tests import (
38
 
    scenarios,
39
 
    script,
40
 
    )
41
 
 
42
 
 
43
 
load_tests = scenarios.load_tests_apply_scenarios
 
37
from bzrlib.tests import script
44
38
 
45
39
 
46
40
class TestMerge(tests.TestCaseWithTransport):
668
662
        this.lock_write()
669
663
        this.unlock()
670
664
 
 
665
    def test_merge_reversed_revision_range(self):
 
666
        tree = self.make_branch_and_tree(".")
 
667
        for f in ("a", "b"):
 
668
            self.build_tree([f])
 
669
            tree.add(f)
 
670
            tree.commit("added "+f)
 
671
        for context in (".", "", "a"):
 
672
            self.run_bzr("merge -r 1..0 " + context)
 
673
            self.assertPathDoesNotExist("a")
 
674
            tree.revert()
 
675
            self.assertPathExists("a")
 
676
 
671
677
    def test_merge_fetches_tags(self):
672
678
        """Tags are updated by merge, and revisions named in those tags are
673
679
        fetched.
681
687
        builder.build_commit(message="Rev 2a", rev_id='rev-2a')
682
688
        source.tags.set_tag('tag-a', 'rev-2a')
683
689
        source.set_last_revision_info(1, 'rev-1')
684
 
        source.get_config().set_user_option('branch.fetch_tags', 'True')
685
690
        builder.build_commit(message="Rev 2b", rev_id='rev-2b')
686
691
        # Merge from source
687
692
        self.run_bzr('merge -d target source')
690
695
        self.assertEqual('rev-2a', target.tags.lookup_tag('tag-a'))
691
696
        target.repository.get_revision('rev-2a')
692
697
 
693
 
 
694
 
class TestMergeRevisionRange(tests.TestCaseWithTransport):
695
 
 
696
 
    scenarios = (('whole-tree', dict(context='.')),
697
 
                 ('file-only', dict(context='a')))
698
 
 
699
 
    def setUp(self):
700
 
        super(TestMergeRevisionRange, self).setUp()
701
 
        self.tree = self.make_branch_and_tree(".")
702
 
        self.tree.commit('initial commit')
703
 
        for f in ("a", "b"):
704
 
            self.build_tree([f])
705
 
            self.tree.add(f)
706
 
            self.tree.commit("added " + f)
707
 
 
708
 
    def test_merge_reversed_revision_range(self):
709
 
        self.run_bzr("merge -r 2..1 " + self.context)
710
 
        self.assertPathDoesNotExist("a")
711
 
        self.assertPathExists("b")
712
 
 
713
 
 
714
698
class TestMergeScript(script.TestCaseWithTransportAndScript):
715
699
    def test_merge_empty_branch(self):
716
700
        source = self.make_branch_and_tree('source')