← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/workingtree_implementations/test_commit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-04-01 06:48:38 UTC
  • mfrom: (2389.1.1 0.15-to-trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20070401064838-34903c7b0d0c8007
merge 0.15 back to dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_commit.py
101
101
                          tree.commit,
102
102
                          'foo',
103
103
                          local=True)
104
 
 
 
104
 
 
105
    def test_commit_merged_kind_change(self):
 
106
        """Test merging a kind change.
 
107
 
 
108
        Test making a kind change in a working tree, and then merging that
 
109
        from another. When committed it should commit the new kind.
 
110
        """
 
111
        wt = self.make_branch_and_tree('.')
 
112
        self.build_tree(['a'])
 
113
        wt.add(['a'])
 
114
        wt.commit('commit one')
 
115
        wt2 = wt.bzrdir.sprout('to').open_workingtree()
 
116
        os.remove('a')
 
117
        os.mkdir('a')
 
118
        wt.commit('changed kind')
 
119
        wt2.merge_from_branch(wt.branch)
 
120
        wt2.commit('merged kind change')
 
121
 
105
122
    def test_local_commit_ignores_master(self):
106
123
        # a --local commit does not require access to the master branch
107
124
        # at all, or even for it to exist.