You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Shlomi Fish <sh...@iglu.org.il> on 2004/05/11 17:24:43 UTC
[PATCH] Fix for Issue 1771
Attached is a patch that fixes issue #1771. Here's the log:
<<<
Fixes Issue #1771 (characters trimmed from path on diff result)
* subversion/libsvn_client/diff.c:
(diff_file_changed): added a code to make sure a full path component is
included in the file's uncommon suffix.
* subversion/tests/clients/cmdline/diff_tests.py
Added a helper function extract_diff_path() to extract the path component
given in parenthesis in the diff.
Added a test to make sure the issue does not re-occur.
>>>
Regards,
Shlomi Fish
--
---------------------------------------------------------------------
Shlomi Fish shlomif@iglu.org.il
Homepage: http://shlomif.il.eu.org/
Quidquid latine dictum sit, altum viditur.
[Whatever is said in Latin sounds profound.]
Re: [PATCH] Fix for Issue 1771
Posted by Shlomi Fish <sh...@iglu.org.il>.
On Wednesday 12 May 2004 21:44, Josh Pieper wrote:
> Shlomi Fish wrote:
> > You are right in this case. It should be "or". Thanks.
> >
> > Fixed. The updated patch is attached.
> >
> > Regards,
>
> Applied in r9693.
>
Thanks! I'll update the issue.
Regards,
Shlomi Fishm
> -Josh
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
--
---------------------------------------------------------------------
Shlomi Fish shlomif@iglu.org.il
Homepage: http://shlomif.il.eu.org/
Quidquid latine dictum sit, altum viditur.
[Whatever is said in Latin sounds profound.]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Fix for Issue 1771
Posted by Josh Pieper <jj...@pobox.com>.
Shlomi Fish wrote:
> You are right in this case. It should be "or". Thanks.
>
> Fixed. The updated patch is attached.
>
> Regards,
Applied in r9693.
-Josh
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Fix for Issue 1771
Posted by Shlomi Fish <sh...@iglu.org.il>.
On Tuesday 11 May 2004 20:41, Jani Averbach wrote:
> On 2004-05-11 20:24+0300, Shlomi Fish wrote:
> > + src = extract_diff_path(out[2])
> > + dest = extract_diff_path(out[3])
> > +
> > + good_src = ".../prefix_mydir"
> > + good_dest = ".../prefix_other/mytag"
> > +
> > + if ((src != good_src) and (dest != good_dest)):
> > + print("src is '%s' instead of '%s' and dest is '%s' instead of '%s'"
> > % + (src, good_src, dest, good_dest))
> > + raise svntest.Failure
>
> Could it be that: 'src == good_src but dest != good_dest' or vice versa?
>
> In this case your test will pass. (Should 'and' be 'or'?).
>
You are right in this case. It should be "or". Thanks.
Fixed. The updated patch is attached.
Regards,
Shlomi Fish
--
---------------------------------------------------------------------
Shlomi Fish shlomif@iglu.org.il
Homepage: http://shlomif.il.eu.org/
Quidquid latine dictum sit, altum viditur.
[Whatever is said in Latin sounds profound.]
Re: [PATCH] Fix for Issue 1771
Posted by Jani Averbach <ja...@jaa.iki.fi>.
On 2004-05-11 20:24+0300, Shlomi Fish wrote:
> + src = extract_diff_path(out[2])
> + dest = extract_diff_path(out[3])
> +
> + good_src = ".../prefix_mydir"
> + good_dest = ".../prefix_other/mytag"
> +
> + if ((src != good_src) and (dest != good_dest)):
> + print("src is '%s' instead of '%s' and dest is '%s' instead of '%s'" %
> + (src, good_src, dest, good_dest))
> + raise svntest.Failure
Could it be that: 'src == good_src but dest != good_dest' or vice versa?
In this case your test will pass. (Should 'and' be 'or'?).
BR, Jani
--
Jani Averbach
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Fix for Issue 1771
Posted by Shlomi Fish <sh...@iglu.org.il>.
I should note that this patch passes all the tests. And the issue URL is:
http://subversion.tigris.org/issues/show_bug.cgi?id=1771
from which the code for the fix has originated.
Regards,
Shlomi Fish
On Tuesday 11 May 2004 20:24, Shlomi Fish wrote:
> Attached is a patch that fixes issue #1771. Here's the log:
>
> <<<
> Fixes Issue #1771 (characters trimmed from path on diff result)
>
> * subversion/libsvn_client/diff.c:
> (diff_file_changed): added a code to make sure a full path component is
> included in the file's uncommon suffix.
>
> * subversion/tests/clients/cmdline/diff_tests.py
> Added a helper function extract_diff_path() to extract the path component
> given in parenthesis in the diff.
> Added a test to make sure the issue does not re-occur.
>
>
> Regards,
>
> Shlomi Fish
--
---------------------------------------------------------------------
Shlomi Fish shlomif@iglu.org.il
Homepage: http://shlomif.il.eu.org/
Quidquid latine dictum sit, altum viditur.
[Whatever is said in Latin sounds profound.]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org