"C. Michael Pilato" <cmpil...@collab.net> writes:
> phi...@apache.org wrote:
>> Author: philip
>> Date: Mon May 10 16:00:53 2010
>> New Revision: 942802
>>
>> URL: http://svn.apache.org/viewvc?rev=942802&view=rev
>> Log:
>> More svn_wc_entry_t removal. This changes the commit notification in
>> some cases, but the new notification seems more consistent with the
>> changes made in the repository.
>
> Explain? What changed? Why?
$ svn diff -cr942802 ../src/subversion/tests/cmdline/merge_tests.py
Index: ../src/subversion/tests/cmdline/merge_tests.py
===================================================================
--- ../src/subversion/tests/cmdline/merge_tests.py (revision 942801)
+++ ../src/subversion/tests/cmdline/merge_tests.py (revision 942802)
@@ -3009,7 +3009,6 @@
expected_output = svntest.wc.State(wc_dir, {
'A/C' : Item(verb='Sending'),
'A/C/foo' : Item(verb='Replacing'),
- 'A/C/foo/bar' : Item(verb='Adding'),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
@@ -3029,6 +3028,16 @@
expected_status,
None, wc_dir)
It's a merge that replaces a directory. The commit used to generate
an 'Adding' notification for one of the chidren. The change in the
repository looks like:
$ svn log -vqrhead file://`pwd`/svn-test-work/repositories/merge_tests-34/
------------------------------------------------------------------------
r6 | jrandom | 2010-05-10 17:39:24 +0100 (Mon, 10 May 2010)
Changed paths:
M /A/C
R /A/C/foo (from /A/B/F/foo:5)
A/C/foo/bar is not explicitly changed and that was also the case
before r942802.
--
Philip
