[patch] new merge tests suggested by Aaron

[John Arbash Meinel]

duchier at ps.uni-sb.de wrote:
> 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
> 

Were those patches approved, and just haven't been merged yet? Do you
have this branch publicly available so that I can 'bzr merge' rather
than using patch?

What is your full name, so that I can attribute you correctly. Your
email doesn't have a full name, just the username 'duchier', and you
only sign things "Denys".

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 256 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051221/c8dcf911/attachment.pgp