Hi,

I recently upgraded from sarge to etch, just to find this bug still
present, which quite surprised me. So I started to find out the reasons.

The problem seems to be the following code:

## snip from /usr/share/websvn/comp.php, line 144ff
if (!$noinput)
{
   $rawcmd = $config->svn." diff -r$rev1:$rev2 ".quote("file:///".$path1)." 
".quote("file:///".$path2);
   $cmd = quoteCommand($rawcmd, true);
   if ($debug) echo "$cmd\n";
}
## snip

which produces, for example, the following command line:

svn --non-interactive diff -r5260:5261 'file:////var/svn/mitschriebwiki/' 
'file:////var/svn/mitschriebwiki/' 2>&1

This mixes two different ways to call svn diff[1]. The correct command
line should probably be:

svn --non-interactive diff -r5260:5261 --old 'file:////var/svn/mitschriebwiki/' 
--new 'file:////var/svn/mitschriebwiki/' 2>&1

Which seems to work fine here.

The correct code should then probably be:

## snip from /usr/share/websvn/comp.php, line 144ff
if (!$noinput)
{
   $rawcmd = $config->svn." diff -r$rev1:$rev2 --old 
".quote("file:///".$path1)." --new ".quote("file:///".$path2);
   $cmd = quoteCommand($rawcmd, true);
   if ($debug) echo "$cmd\n";
}
## snip

Greetings,
Joachim

[1] http://svnbook.red-bean.com/nightly/en/svn.ref.svn.c.diff.html
-- 
Joachim "nomeata" Breitner
Debian Developer
  [EMAIL PROTECTED] | ICQ# 74513189 | GPG-Keyid: 4743206C
  JID: [EMAIL PROTECTED] | http://people.debian.org/~nomeata



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to