Hi all,
I recently ran into a problem retrieving revision information. The errors
for retrieving revision
history (using svn blame) happened after a recent move of a directory
containing Java
files. After the move I started to receive errors when using 'svn blame' so
I tried to do a
reverse merge. When using 'svn blame' continued to have errors I tried using
svn delete to
remove the directory and svn copy with the revision number before the
directory move to
restore the directory to the revision before the move. Now when I try to use
svn blame I am
receiving "Could not resolve path ... for history".
The exact line I am using is:
svn blame
http://power-architect.googlecode.com/svn/trunk/src/ca/sqlpower/architect/ArchitectSession.java
which returned:
svn: Could not resolve path
/trunk/src/ca/sqlpower/architect/ArchitectSession.java for history
Running the command:
svn cat
http://power-architect.googlecode.com/svn/trunk/src/ca/sqlpower/architect/ArchitectSession.java
returned the file as it existed before the directory move.
I have tried searching the web and the mailing list for users with a similar
problem but have
found none. From the "Version Control with Subversion" section on
resurrecting deleted items
using 'svn delete' on the directory then 'svn copy' on the revision before
the change should link
the new directory and files with the ones before the move and remove this
error but it did not.
Is there a way to restore my directory so the revision history of the files
are linked with the originals?
The full set of changes were as follows:
For reference:
Project: http://code.google.com/p/power-architect/
svn: version 1.6.3
Eclipse: version 3.4.1
Subclipse: version 1.6.3
Before any changes I was on r3393.
I started with moving the directory and all subdirectories and files at
trunk/src/ca to
trunk/src/main/java/ca using Eclipse and Subclipse.
The log:
svn log -v -r 3394 http://power-architect.googlecode.com/svn/trunk/
returned:
r3394 | thomasobrien95_at_gmail.com | 2010-03-24 17:07:56 -0400 (Wed, 24 Mar
2010) | 3 lines
Changed paths:
...
D /trunk/src/ca
...
A /trunk/src/main
A /trunk/src/main/java
A /trunk/src/main/java/ca (from /trunk/src/ca:3393)
...
This appears that the folder was moved correctly and the history of
/trunk/src/main/java/ca
is linked to /trunk/src/ca as expected.
Next I tried to view revision information:
svn blame
http://power-architect.googlecode.com/svn/trunk/src/main/java/ca/sqlpower/architect/ArchitectSession.java@3394
returned:
svn: Could not resolve path /trunk/src/ca/ArchitectSession.java for history
I noticed the path at this point was wrong. The ArchitectSession.java file
is located at
/trunk/src/ca/sqlpower/architect.
Verifying revision information:
svn blame
http://power-architect.googlecode.com/svn/trunk/src/ca/sqlpower/architect/ArchitectSession.java@3393
returned:
1600 fuerth /*
2099 jeffrey_at_sqlpower.ca * Copyright (c) 2008, SQL Power Group Inc.
2099 jeffrey_at_sqlpower.ca *
2099 jeffrey_at_sqlpower.ca * This f....
Since the revision before my commit caused the error I decided it would be
best to
reverse the change.
The first step I took to try and reverse the change was I went to Eclipse
and did a reverse
merge from r3394 to r3393. This reversed the file move but retrieving
revision information
was still failing:
svn blame
http://power-architect.googlecode.com/svn/trunk/src/ca/sqlpower/architect/ArchitectSession.java@3395
returned:
svn: Could not resolve path
/trunk/src/ca/sqlpower/architect/ArchitectSession.java for history
The path to the file was now correct but the path still could not be
resolved.
Finally, I decided to try and remove the entire directory and copy
everything from r3393,
before the directory change.
I tried:
svn delete -m "removing all of src to check it back in to fix history."
https://power-architect.googlecode.com/svn/trunk/src
followed by:
svn copy https://power-architect.googlecode.com/svn/trunk/src@3393
https://power-architect.googlecode.com/svn/trunk/src
However, this still resulted in:
svn blame
http://power-architect.googlecode.com/svn/trunk/src/ca/sqlpower/architect/ArchitectSession.java
returning:
svn: Could not resolve path
/trunk/src/ca/sqlpower/architect/ArchitectSession.java for history
Any help in restoring my revision history would be greatly appreciated.
Thanks,
Thomas
Received on 2010-03-25 23:10:04 CET