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

RE: [Subclipse-users] Merge problem

From: Zsolt <zkoppanylist_at_intland.com>
Date: 2006-03-13 15:47:17 CET

>From: Mark Phippard [mailto:markp@softlanding.com]
>Sent: Monday, March 13, 2006 3:12 PM
>To: users@subclipse.tigris.org
>Subject: Re: [Subclipse-users] Merge problem
>
>"Zsolt" <zkoppanylist@intland.com> wrote on 03/13/2006 08:02:49 AM:
>
>> I'm using subclipse-0.9.108 with eclipse-3.1.2 Win-XP.
>>
>> I get an error when I try to merge from a branch.
>> svn: Attempted to get checksum of a *non*-file node
>>
>> but "Unified Diff" provides correct output (unfortunately not on the
>> display).
>>
>> Here are the commands from svn console:
>>
>> diff -r 12465:12466 svn://codebeamer.com/cbdev/branches/cb-4.0-fixes
>>
>> merge --dry-run -r12465:12466
>> svn://codebeamer.com/cbdev/branches/cb-4.0-fixes C:/Dokumente und
>> Einstellungen/zk/Eigene
>> Dateien/workspace/cb/src/cv/servlet/docs/DisplayDocument.java
>>
>> (The working filename is correct.)
>>
>> From shell I can execute the command below without any problems:
>>
>> svn merge --dry-run -r12465:12466
>> svn://codebeamer.com/cbdev/branches/cb-4.0-fixes
>
>That error has to be coming out of the adapter. If you are using JavaHL,
>then doing the same merge command using the command line should produce
>the same error, in which case you can report it on the Subversion mailing
>lists. If using JavaSVN, then perhaps Alex can will followup.

I'm using JavaSvn.

>
>Of course switching your adapter to see what error it produces is always a
>good idea too.
>
>Actually, looking at your command output above, it looks like the path to
>a specific file was given. Did you have a file selected when you did Team
>-> Merge and then you picked a folder in the repository? That is
>certainly what appears to have happened.

I did it from the editor: Team->Merge ....
Zsolt

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Mon Mar 13 15:51:05 2006

This is an archived mail posted to the Subclipse Users mailing list.