Re: [Fwd: Merge BUG in Windows]

uppsss..... I really apologize but I made a mistake again….

Finally, the real message that I get is only:

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

There’s no “C EncomendasLojas.dfm” line...

I’m really sorry for all this mess, but in my test repository I had more
files than the one
that is causing problems and I wanted to isolate the information…

Sorry again,

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 17:11:47 2003