Comment 4 for bug 228506
Revision history for this message
| James Westby (james-w) wrote Re: [Bug 228506] Re: Conflicts encountered in checkouts have confusing errors about adding .BASE .THIS and .OTHER files | #4 |
On Mon, 2008-06-16 at 22:59 +0000, Mary Gardiner wrote:
> 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.
>
Thanks, that would be really helpful. I don't use checkouts
myself much, especially not where I have to "update" before
"commit", so I'm not very used to what goes on.
Thanks,
James