Re: tree conflict on tc_url_rev branch?

Stefan Sperling wrote:
> On Sun, Nov 23, 2008 at 05:30:50PM +0000, Stefan Sperling wrote:
>> Hi,
>>
>> in r34288, I added this file on trunk:
>
>> For some reason, the file was not added in the sync-up commit
>> I made in r34325. I don't really understand why this happened.
>
> I forgot to mention that throughout all of this, I was using svn
> version 1.5.4 (r33841).

Reproduced with 1.5.1. So that this problem doesn't harm the branch, I've
done a

svn cp \
 $svnrepos/trunk/notes/tree-conflicts/use-cases-resolution.txt \
 $svnrepos/branches/tc_url_rev/notes/tree-conflicts/use-cases-resolution.txt

to fix the problem. We should try to reproduce this elsewhere in case we
need to.

~Neels