[MERGE REVIEW]

[Martin Pool]

On 09/04/2006, at 4:36 PM, Aaron Bentley wrote:
>
> === modified file 'a/bzrlib/tests/test_merge.py'
> --- a/bzrlib/tests/test_merge.py	
> +++ b/bzrlib/tests/test_merge.py	
> @@ -43,6 +43,24 @@
>          self.assertRaises(UnrelatedBranches, merge, ['branch2', -1],
>                            [None, None])
>          return wt2
> +
> +    def test_merge_one(self):
> +        wt1 = self.make_branch_and_tree('branch1')
> +        wt1.commit('empty commit')
> +        wt2 = self.make_branch_and_tree('branch2')
> +        wt2.pull(wt1.branch)
> +        file('branch1/foo', 'wb').write('foo')
> +        file('branch1/bar', 'wb').write('bar')
> +        wt1.add('foo')
> +        wt1.add('bar')
> +        wt1.commit('add foobar')
> +        os.chdir('branch2')
> +        self.run_bzr('merge', '../branch1/baz', retcode=3)
> +        self.run_bzr('merge', '../branch1/foo')
> +        self.failUnlessExists('foo')
> +        self.failIfExists('bar')
> +        wt2 = WorkingTree.open_containing('branch2')[0]
> +        self.assertEqual(wt2.pending_merges(), [])

Possibly this should be in blackbox/ since it's exercising the  
command line interface, not directly the merge code itself.

Do you think merge with interesting_files set is adequately tested in  
other places?

+1

-- 
Martin