Mark Phippard wrote:
> Daniel Serodio <daniel.listas@xxx.com.br> wrote on 07/18/2006 02:26:54 PM:
>
>
>> I opened a file in the History view. The last two revisions for this
>> file are 2441 and 2013. I want to revert the changes made in r2441, so I
>> right-clicked this revision and chose "Revert changes from Revision
>>
> 2441".
>
>> After confirmation, Subclipse ran:
>>
>> merge -r2441:2440
>>
>>
> svn://vulcano/Ereinion/trunk/src/java/br/pucsp/apt/ereinion/web/SecurityFilter.java
>
>> C:/Documents and
>>
>>
> Settings/dserodio/Desktop/projetos/Ereinion/src/java/br/pucsp/apt/ereinion/web/SecurityFilter.
>
>> java
>>
>> Which generated the error:
>> svn: File not found: revision 2440, path
>>
>>
> '/Turgon/trunk/src/java/br/pucsp/apt/turgon/seguranca/SecurityFilter.java'
>
>> Shouldn't Subclipse try "merge -r2441:2013" instead? I'm using Subclipse
>> 1.1.2 with JavaSVN 1.0.6
>>
>
> No the merge command is right, and if the file were changed in 2013, then
> any value between 2013 and 2440 will give the same result anyway, as the
> file has the same contents in each of those revisions.
>
> Did r2441 delete this file? If so, then you may need to select the parent
> folder, show its history and reverse that revision.
>
> Mark
>
Sorry, I forgot to check before posting; r2441 moved this file _and_
changed its contents. I guess a "merge" wouldn't work anyway then, right?
Thanks,
Daniel Serodio
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Tue Jul 18 21:15:54 2006