On Wed, 2010-12-01, Kamesh Jayachandran wrote: > Hi Prabhu, > > 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. Please could you include a test for these cases in your patch? Then it will be absolutely clear. Thanks. - Julian > Without your patch we get a failure > "explicitly_reinstated_file_with_mod_at_rN does not exist at rN-1" > With your patch we get *modification* alone. > > 2. svn di -cN Parent_Dir_of_explicitly_reinstated_file_at_rN > Without your patch we get all lines as added. > With your patch we get only what got injected along with copy in rN. > > > So if somebody wants all lines as added in above cases they can use > --show-copies-as-adds. > > Please fix your patch to remove this new param diff-copy-from in all the > layers and assume it to be TRUE unless "--show-copies-as-adds" is given. > > Thanks > With regards > Kamesh Jayachandran > > On 11/30/2010 03:26 PM, Prabhu Gnana Sundar wrote: > > Hi, > > > > In my previous patch [1] I suggested the addition of the > > '--diff-copy-from' switch to 'svn diff' to solve the cases where 'svn > > diff' would do the diff against the copyfrom source file when a file is > > reinstated or diff target is *not* explicit file. > > > > But since there is already a point that diff behaves differently in > > different scenarios, making 'svn diff' work the same in all scenarios is > > one good option. This patch would solve the problem of making 'svn diff' > > work the same in all conditions by passing 'TRUE' for the > > 'diff_copy_from' option by default. Hence I removed the > > '--diff-copy-from' switch in this patch. This is a more generic way to > > bridge the gap. > > > > I am attaching the patch and the log with this mail. Please review and > > comment on the same. > > > > I still retain this param on svn_client_diff5 and svn_ra_diff4 in case > > somebody wants old behaviour, otherwise I can remove that too. > > > > Regards > > Prabhu > > > > [1]http://mail-archives.apache.org/mod_mbox/subversion-dev/201011.mbox/% > > 3c1291018400.4021.3.ca...@prabhugnanasundar%3e >
