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

[Subclipse-users] Merge problem

From: Zsolt <zkoppanylist_at_intland.com>
Date: 2006-03-13 14:02:49 CET

Hi,

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

Any ideas?

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 14:03:11 2006

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