You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2013/01/08 21:39:40 UTC
svn commit: r1430500 -
/subversion/trunk/subversion/tests/cmdline/merge_tests.py
Author: julianfoad
Date: Tue Jan 8 20:39:40 2013
New Revision: 1430500
URL: http://svn.apache.org/viewvc?rev=1430500&view=rev
Log:
* subversion/tests/cmdline/merge_tests.py
(merge_binary_file_with_keywords): Adjust to better match the issue, and add
notes.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1430500&r1=1430499&r2=1430500&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Tue Jan 8 20:39:40 2013
@@ -17889,8 +17889,11 @@ def merge_binary_file_with_keywords(sbox
sbox.simple_copy('foo', 'bar')
sbox.simple_commit()
- # modify the branched version
- svntest.main.file_append('foo', "Line 2.\n")
+ # modify the branched version (although the bug shows even if we modify
+ # just the original version -- or neither, which is a completely
+ # degenerate 'merge' case)
+ # ### Perhaps a dir merge would behave differently from a single-file merge?
+ svntest.main.file_append('bar', "Line 2.\n")
sbox.simple_commit()
# merge back