Re: Bug in merge dialog when "comparing revisions"

Nick Gilbert wrote:

> I've just tried to do a merge. When I click "Diff" and then right click
> a file and choose "compare revisions", I get a "file not found" error
> and it's trying to open the files:
>
> PROPFIND request failed on
> '/svn/kno/!svn/bc/153/branches/hollis-new-db/Website/profile.aspx' path
> not found.
>
> I am by the way, using the SVN_ASP_DOT_NET_HACK env variable and it
> shouldn't be using !svn folders at all, but perhaps that's not relevant
> when talking to the server?

That url you see in the error message is the internal url Subversion
uses to access previous revisions. It has nothing to do with the
SVN_ASP_DOT_NET_HACK.

> Either way, it doesn't seem to find the required files.

You can check that yourself: does the file exist in revision 153?
The "problem" here is: you can specify revisions in the merge dialog
where an url doesn't exist yet, and the "diff" will work. But in the
diff dialog, comparing will fail because the files in question don't
exist yet at the specified revisions.

> Is this a bug or am I doing something silly?

I'm wondering why the svn_diff_summarize() works with non-existing paths...

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org