Vote #64427
未完了Subversion: Error message for some of view differences
0%
説明
Some of view differences give error message The entry or revision was not found in the repository.
for example, when I try to check diff between source:/trunk/app/controllers/account_controller.rb@62 and source:/trunk/app/controllers/account_controller.rb@44 from http://www.redmine.org/repositories/changes/redmine/trunk/app/controllers/account_controller.rb, I'm getting above error.
When I tried bellow from the shell.
>svn diff -r 44:62 http://redmine.rubyforge.org/svn/trunk/app/controllers/account_controller.rb@62
gives same error in the shell.
but
>svn diff -r 44:62 http://redmine.rubyforge.org/svn/trunk/app/controllers/account_controller.rb
gives the diff.
I'm not sure [@REV] required or not (source:trunk/lib/redmine/scm/adapters/subversion_adapter.rb@2045#L181).
journals
> for example, when I try to check diff between source:/trunk/app/controllers/account_controller.rb@62 and source:/trunk/app/controllers/account_controller.rb@44 from http://www.redmine.org/repositories/changes/redmine/trunk/app/controllers/account_controller.rb, I'm getting above error.
/trunk/app/controllers/account_controller.rb doesn't exist at r62. That's why you get this error.
/trunk/redmine was moved to /trunk at r67.
Reopen if needed.
--------------------------------------------------------------------------------
Jean-Philippe Lang wrote:
> /trunk/app/controllers/account_controller.rb doesn't exist at r62. That's why you get this error.
> /trunk/redmine was moved to /trunk at r67.
Thanks JP! Now I can understand what has happened.
Subversion can see the all of history if @svn copy@ or @svn move@ has been used for moving /trunk/redmine to /trunk.(svn shares the history between branches)
I think the shelling out difference between r44 and r66 in "the history page of account_controller.rb":http://www.redmine.org/repositories/changes/redmine/trunk/app/controllers/account_controller.rb should be as bellow.
<pre>
>svn diff -r 44:62 http://redmine.rubyforge.org/svn/trunk/app/controllers/account_controller.rb@HEAD
</pre>
Because the given path is based on *HEAD*, not a specific revision.
This gives the correct history even though the /trunk/app/controllers/account_controller.rb doesn't exist before r67.
+We need to differ the case for specific revision and HEAD+. It would be better to regard [@REV] as a part of path.
p.s. the link source:/trunk/app/controllers/account_controller.rb@62 giving same error message. but it seems natural becasue the path doesn't exist at revision 62.
--------------------------------------------------------------------------------
You're absolutely right. I think the solution is to add one more argument to the diff method to specify the revision of the given path. This will be HEAD in most cases, unless browsing the repository at a specific revision.
The svn diff command would be:
<pre>
svn diff -r <identifier_to>:<identifier_from> <path>@<identifier>
</pre>
Correct me if I'm wrong.
--------------------------------------------------------------------------------
Thanks JP!
I agree with your solution. Maybe it would be important to check the other SCM also need 3rd arguement.
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
Is anyone looking at this for an upcoming release? Do we need a patch?
--------------------------------------------------------------------------------
+1 Subversion
--------------------------------------------------------------------------------
+1
--------------------------------------------------------------------------------
related_issues
relates,New,4262,Bazaar: correct renames handling, other improvements
duplicates,Closed,13601,Repository history problems following svn mv
duplicates,Closed,7324,Subversion diff gives an error.
duplicates,Closed,9679,Subversion: 404 on diff of renamed files
duplicates,Closed,3285,Renamed SVN Project/Folder :: problem when try to view difference.
Admin Redmine さんが3年以上前に更新
- カテゴリ を SCM_3 にセット
- 対象バージョン を Candidate for next minor release_33 にセット