Comment 3 for bug 228506

I'll see if I can come up with a test case regarding whether the files are hanging around from a previous commit. It might not be the case: checkout has a bunch of bugs where it tries to do things twice (eg creating .BASE etc files) and doesn't realise it, something to do with merges actually being performed twice when updates are performed. If I can come up with a test case I'll file a new bug.