Re: [Fwd: Merge BUG in Windows]

Sorry! Just a little correction...

In my last email, when its said:

C Novo Documento de texto.txt
svn: End of file found
svn: Failed to read file 'EncomendasLojas.dfm.tmp'.

it should be:

C EncomendasLojas.dfm
svn: End of file found
svn: Failed to read file 'EncomendasLojas.dfm.tmp'.

Sorry... I wrote the name of a file from the project I was working in that moment :)

Pedro Costa

kfogel@collab.net wrote:

>Pedro Beck Gomes da Costa <pbeck@ciberbit.pt> writes:
>
>
>>I send the file in attachement. If I create a new Repository with only
>>this file and checkout it and then create a branch and then change the
>>file in the branche, when i try to merge it with the trunk i get the
>>error.
>>
>>
>
>What's the exact command line you use for the merge, and what is all
>the output?
>
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 11 13:18:07 2003