[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [Fwd: Merge BUG in Windows]

From: Pedro Beck Gomes da Costa <pbeck_at_ciberbit.pt>
Date: 2003-11-20 13:12:35 CET

Just to say that SubVersion 0.33.1 solved this problem (now I can merge
this file).
thks
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 Thu Nov 20 13:14:12 2003

This is an archived mail posted to the Subversion Dev mailing list.