[patch] new merge tests suggested by Aaron

[duchier at ps.uni-sb.de]

John Arbash Meinel <john at arbash-meinel.com> writes:

> By the way, what tree is this a diff against, I don't have the line:
>   self.assertEqual(file('a/file').read(),'THAT')

er, oh... it's against an earlier revision of my bzr.tests branch
which also includes two other new tests that I posted a patch for
earlier:

	test_merge_swapping_renames
	test_merge_delete_and_add_same

The mysterious line you are wondering about is the last line of
test_merge_delete_and_add_same.

> Also, I removed you .bzrignore of PATCH.1. I'm not sure what tool you
> use. I generally just do:
>
> bzr diff -r a..b > ../patches/patch-name-foo.diff

You're right. I should store the patches outside the tree instead of
bzrignoring them.  Obviously, I need more practice at preparing
patches ready for public consumption :-/

Cheers,

--Denys