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

Re: [PATCH] Re: strange behavior when dealing with copied files repos/wc diffs

From: Karl Fogel <kfogel_at_red-bean.com>
Date: 2007-10-23 01:40:32 CEST

"Hyrum K. Wright" <hyrum_wright@mail.utexas.edu> writes:
> Ping... have any of the full committers had a chance to look at this
> patch? If nothing happens, I'll put it in the issue tracker.

+1 for Charles Acknin to commit. But Charles, are you sure the
"-rBASE" makes a difference here, since you already backdated the
working copy to r1? If you remove the -rBASE, does anything change?

The right way to test -rBASE is to make some local mods right before
diffing, and then ensure that they *don't* show up in the diff, I
think. Feel free to tweak the test to do that.

Hyrum, thanks as always for the digilent patch tracking!

-Karl

>> However, to prevent any regression here's the test updated:
>>
>> [[[
>> Add a non-regression diff test against bug that r26503 fixes. (see
>> http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=129865)
>>
>> * subversion/tests/cmdline/diff_tests.py
>> (diff_repos_base_copy_reversed): new test for backward repos-base diff
>> against copied-file.
>> ]]]
>>
>> [[[
>> Index: subversion/tests/cmdline/diff_tests.py
>> ===================================================================
>> --- subversion/tests/cmdline/diff_tests.py (revision 26826)
>> +++ subversion/tests/cmdline/diff_tests.py (working copy)
>> @@ -3334,6 +3334,36 @@
>> 'diff', '-x', '--ignore-eol-style',
>> file_path)
>>
>> +def diff_repos_base_copy_reversed(sbox):
>> + "reversed repos-base diff with copied file"
>> +
>> + sbox.build()
>> + wc_dir = sbox.wc_dir
>> + os.chdir(wc_dir)
>> +
>> + # copy a file
>> + mu_path = os.path.join('A', 'mu')
>> + mucp_path = os.path.join('A', 'mucopy')
>> + svntest.main.run_svn(None, 'cp', mu_path, mucp_path)
>> +
>> + # commit r2 and update back to r1
>> + svntest.main.run_svn(None, 'ci', '-m', 'log msg')
>> + svntest.main.run_svn(None, 'up', '-r1')
>> +
>> + # diff r2 against base
>> + diff_repos_base = [
>> + "Index: A/mucopy\n",
>> + "===================================================================\n",
>> + "--- A/mucopy\t(revision 2)\n",
>> + "+++ A/mucopy\t(working copy)\n",
>> + "@@ -1 +0,0 @@\n",
>> + "-This is the file 'mu'.\n",
>> + ]
>> +
>> + svntest.actions.run_and_verify_svn(None, diff_repos_base, [],
>> + 'diff', '-r' , '2:BASE')
>> +
>> +
>> ########################################################################
>> #Run the tests
>>
>> @@ -3383,6 +3413,7 @@
>> diff_in_renamed_folder,
>> diff_with_depth,
>> XFail(diff_ignore_eolstyle_empty_lines),
>> + diff_repos_base_copy_reversed,
>> ]
>>
>> if __name__ == '__main__':
>> ]]]

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Oct 23 01:40:42 2007

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