| Merge problem "File not found: revision..." when opening 3-way comparator [message #25153] |
Tue, 08 July 2008 11:36  |
Eclipse User |
|
|
|
Originally posted by: kamenchuk.mail.ru
I cannot make merging from trunk to branch working for me. I'm getting
error like
*** Get File Content [Revision]
svn: File not found: revision 5779, path
'/branches/mybranch/test/src/Test.java'svn: : (apr_err=160013)
*** Error (took 00:00.003)
when I double click in Synchronize view on a file to bring up comparator
Full list of steps to reproduce the issue with SVN console output:
1. Share project
*** Share Projects
D:/ws-svn-test/test
At revision 6719
*** Ok (took 00:02.093)
*** Commit
svn add "D:\ws-svn-test\test\src"
A D:/ws-svn-test/test/src
A D:/ws-svn-test/test/src/Test.java
svn add "D:\ws-svn-test\test\.classpath"
A D:/ws-svn-test/test/.classpath
svn add "D:\ws-svn-test\test\.project"
A D:/ws-svn-test/test/.project
svn commit "D:\ws-svn-test\test" -m ""
A ws-svn-test/test/.classpath
A ws-svn-test/test/.project
A ws-svn-test/test/src
A ws-svn-test/test/src/Test.java
Transmitting file data: ws-svn-test/test/.classpath
Transmitting file data: ws-svn-test/test/.project
Transmitting file data: ws-svn-test/test/src/Test.java
Committed revision 6720
*** Ok (took 00:01.606)
2. Create branch. Excerpt from Subversive SVN console:
*** Branch
svn copy "D:/ws-svn-test/test"
"svn://10.0.0.102/sandbox/test/branches/mybranch" -r WORKING -m ""
A D:/ws-svn-test/test
A D:/ws-svn-test/test/.classpath
A D:/ws-svn-test/test/.project
A D:/ws-svn-test/test/src
*** Ok (took 00:01.105)
3. Make change in trunk and commit it
*** Commit
svn commit "D:\ws-svn-test\test" -m ""
M ws-svn-test/test/src/Test.java
Transmitting file data: ws-svn-test/test/src/Test.java
Committed revision 6722
*** Ok (took 00:00.909)
4. Switch to branch
*** Switch
svn switch "svn://10.0.0.102/sandbox/test/branches/mybranch"
"D:\ws-svn-test\test" -r HEAD --depth infinity
U D:/ws-svn-test/test/src/Test.java
D:/ws-svn-test/test/src
D:/ws-svn-test/test
At revision 6722
*** Ok (took 00:00.281)
5. Merge changes from trunk to branch.
In Merge dialog in simple mode I entered:
URL: svn://10.0.0.102/sandbox/test/trunk
Start revision: 6720
Stop Revision: Head
I get my Synch tree with my Test.java file in there.
6. When I double click on this file, error pops up
Get content for
' svn://10.0.0.102/sandbox/test/branches/mybranch/src/Test.jav a' failed.
Filesystem has no item
svn: File not found: revision 6720, path
'/sandbox/test/branches/mybranch/src/Test.java'
Can someone help me please to find out what's wrong with it?
I use:
Eclipse SDK Version: 3.4.0 Build id: I20080609-1311
Subversive 2.0.1.I20080612-1500
Native JavaHL (svn:1.4.5 (r25188) jni:0.9.0)
Regards
Alexey
|
|
|
|
Powered by
FUDForum. Page generated in 0.02920 seconds
Home