[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: [PATCH] enhance diff to make it behave uniformly

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: Sat, 4 Dec 2010 01:28:10 +0530

> I understand your patch fixes the following two cases.
> 1. svn di -cN explicitly_reinstated_file_with_mod_at_rN

>Hi Kamesh and Prabhu.

>What you're describing here sounds good - it sounds like a simpler and
>more definite change than what I understood before - but I'm not sure
>precisely what "explicitly_reinstated_file_with_mod_at_rN" means.

I mean the following,
$cd /tmp
$svnadmin create aaa
$svn co file:///tmp/aaa/ aaa_wc
Checked out revision 0.
$cd aaa_wc/
$echo "line1"> test.c
$svn add test.c
A test.c
$svn ci -m "q"
Adding test.c
Transmitting file data .
Committed revision 1.
$svn rm test.c
D test.c
$svn ci -m "q"
Deleting test.c

Committed revision 2.
$/u1/SvnEdge/svn-server/bin/svn cp file:///tmp/aaa/test.c_at_1 .
A test.c
$echo "line2">> test.c
$svn ci -m "q"
Adding test.c
Transmitting file data .
Committed revision 3.
$/u1/SvnEdge/svn-server/bin/svn di -c3 test.c
svn: Unable to find repository location for 'test.c' in revision 2

Above error would not happen with this patch. It would rather give something like svnlook diff --diff-copy-from.

$svnlook diff --diff-copy-from -r3 /tmp/aaa
Copied: test.c (from rev 1, test.c)
--- test.c 2010-12-03 19:48:15 UTC (rev 1)
+++ test.c 2010-12-03 19:49:40 UTC (rev 3)
@@ -1 +1,2 @@

>Please could you include a test for these cases in your patch? Then it
>will be absolutely clear.

Prabhu already has one. Right now he is working on removing the profileration of UI param diff-copy-from from all the layer in favour of generic send_copyfrom_args.

With regards
Kamesh Jayachandran
Received on 2010-12-03 20:58:49 CET

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.