Hello All,
The problem I would like to report is best described with the "merge 4"
python test:
merge_tests.py, line 776:
# Merge B 3:4 into B2 now causes a conflict
expected_disk.add({
'E/dir_conflicts.prej'
: Item("Trying to change property 'foo' from 'foo_val' to 'mod_foo',\n"
+ "but the property does not exist."),
'E/alpha.prej'
: Item("Trying to change property 'foo' from 'foo_val' to 'mod_foo',\n"
+ "but the property does not exist."),
'E/beta.prej'
: Item("Trying to change property 'foo' from 'foo?\\129val' to"
+ " 'mod?\\129foo',\n"
+ "but the property does not exist."),
})
expected_disk.tweak('E', 'E/alpha', props={'bar' : 'bar_val'})
expected_disk.tweak('E/beta', props={'bar' : 'bar\201val'})
expected_status.tweak('E', 'E/alpha', 'E/beta', status=' C')
svntest.actions.run_and_verify_merge(B2_path, '3', '4', B_url,
expected_output, /// *
expected_disk,
expected_status,
expected_skip,
None, None, None, None, None, 1)
* expected_output variable is set at line 729:
expected_output = wc.State(B2_path, {
'E' : Item(status=' U'),
'E/alpha' : Item(status=' U'),
'E/beta' : Item(status=' U'),
})
So, subversion properly detects properties conflict and generates
appropriate .prej file, but prop status reported is 'U', not 'C'.
I suppose that there is a bug in Subversion, but it may happen that I just
missed something.
Alexander Kitaev,
TMate Software,
http://tmate.org/
http://jetbrains.com/tmate/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 8 19:11:27 2005