[PATCH] test case for deleting changed contents

[John A Meinel]

Robert Collins wrote:
> On Sat, 2005-10-29 at 10:36 -0500, John A Meinel wrote:
>> I'm trying to go through the bugtracker and mark old bugs as fixed.
>>
>> This bug:
>> https://launchpad.net/products/bzr/+bug/2866
>>
>> Mentions the old bug after changing the contents of a file, merging a
>> change which deletes it would fail from mismatched contents.
>>
>> This has been fixed, but I wrote a test to make sure.
>> I figure we might as well include the test in the test suite.
>> So it is attached.
> 
> Care to stash this (and similar things) in your integration branch ? Its
> easier than applying patches for me.
> 
> Rob
> 

Done.
I'll put this sort of thing into integration in the future. I just
didn't have one for a while.

I also cleaned it up, since you moved commit() out of the Branch object.
But it passes in my integration tree.

John
=:->


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