Rev 2375: (broken) merge a test case showing that commiting a merge of a kind change fails. in http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/commit_kind_change_90111

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/commit_kind_change_90111

------------------------------------------------------------
revno: 2375
revision-id: john at arbash-meinel.com-20070323192548-f81b8vw3irmyclhe
parent: pqm at pqm.ubuntu.com-20070322230820-f8735ba918f51539
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: commit_kind_change_90111
timestamp: Fri 2007-03-23 14:25:48 -0500
message:
  (broken) merge a test case showing that commiting a merge of a kind change fails.
modified:
  bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
-------------- next part --------------
=== modified file 'bzrlib/tests/workingtree_implementations/test_commit.py'
--- a/bzrlib/tests/workingtree_implementations/test_commit.py	2007-03-20 00:49:11 +0000
+++ b/bzrlib/tests/workingtree_implementations/test_commit.py	2007-03-23 19:25:48 +0000
@@ -101,7 +101,25 @@
                           tree.commit,
                           'foo',
                           local=True)
- 
+
+    def test_commit_merged_kind_change(self):
+        """Test merging a kind change.
+
+        Test making a kind change in a working tree, and then merging that
+        from another. When committed it should commit the new kind.
+        """
+        wt = self.make_branch_and_tree('.')
+        wt.lock_write()
+        self.build_tree(['a'])
+        wt.add(['a'])
+        wt.commit('commit one')
+        wt2 = wt.bzrdir.sprout('to').open_workingtree()
+        os.remove('a')
+        os.mkdir('a')
+        wt.commit('changed kind')
+        wt2.merge_from_branch(wt.branch)
+        wt2.commit('merged kind change')
+
     def test_local_commit_ignores_master(self):
         # a --local commit does not require access to the master branch
         # at all, or even for it to exist.