Geens, Steven wrote:
> I was wondering if someone already encountered this problem, before I
> start making an extensive study why this went wrong:
>
> Eclipse 3.2.1, Subclipse 1.0.3, svnserve 1.4.0
>
> This is roughly the history of a certain file:
> - Added be/stgn/test/Tester.java to the repository.
> - 11 Added a test method
> - 12 Removed a test method
> - Renamed be/stgn to be/wiva (and of course modified the java
> package name).
>
> If I look at the revision history by Right clicking the file -> Team
> -> Show In Resource History ...
> and Right click revision 12 -> Revert changes from Revision 12
> (A stupid way to add the test method once more.)
>
> I get the following message in the console:
> "
> merge -r12:11 svn://svnserver/test/trunk/be/wiva/test/Tester.java
> D:/eclipse3.2.1/workspace/SVN_Test/be/wiva/test/Tester.java
>
> Filesystem has no item
>
> svn: File not found: revision 12, path
> '/test/trunk/be/wiva/test/Tester.java'
> "
>
> After this problem has presented itself and you refresh the project,
> an empty Tester.java.tmp is created in the same directory as Tester.java.
>
> After reading the syntax of the merge command in the SVN Red book (and
> having no hands-on SVN experience whatsoever), I assume that the
> command should actually be:
> merge -r12:11 svn://svnserver/test/trunk/be/wiva/test/Tester.java@<WC
> revision> D:/eclipse3.2.1/workspace/SVN_Test/be/wiva/test/Tester.java
> Do you need more information?
> Is this reproducible on other systems? (I reproduced this several
> times on my own setup)
> Is this actually a bug or am I using the system incorrectly?
It is a bug, but probably not one that I would try to fix. I am not
100% sure it can be fixed. The Subversion API is very weak in this
area. Rename tracking works well for history, but not much else. Merge
is not smart enough to follow the rename to apply the change to the
right file.
Try it with 1.1.8 (which is the version you ought to use if you are
using Eclipse 3.2). Merge now uses an API that is closer to what you
used from the command line. It might work if you did the Show History
option on the file, as opposed to a parent folder. If you did choose a
parent folder, then I doubt it would work as the SVN API would not
handle the situation.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Tue Nov 21 22:00:49 2006