svn commit: r1892642 - /subversion/trunk/subversion/tests/cmdline/commit_tests.py

[ko...@apache.org]

Author: kotkov
Date: Fri Aug 27 13:49:27 2021
New Revision: 1892642

URL: http://svn.apache.org/viewvc?rev=1892642&view=rev
Log:
Add a test that commits a replaced (with and without history) file with
text modification.

* subversion/tests/cmdline/commit_tests.py
  (commit_replaced_file_with_mods): New test.
  (test_list): Run the new test.

Modified:
    subversion/trunk/subversion/tests/cmdline/commit_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/commit_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/commit_tests.py?rev=1892642&r1=1892641&r2=1892642&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/commit_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/commit_tests.py Fri Aug 27 13:49:27 2021
@@ -3180,6 +3180,27 @@ def commit_sees_tree_conflict_on_unversi
 
   os.chdir(was_cwd)
 
+def commit_replaced_file_with_mods(sbox):
+  "commit a replaced file with modification"
+
+  sbox.build(empty=True)
+
+  sbox.simple_append('foo', 'old foo')
+  sbox.simple_add('foo')
+  sbox.simple_append('bar', 'old bar')
+  sbox.simple_add('bar')
+  sbox.simple_commit()
+
+  sbox.simple_rm('foo')
+  sbox.simple_append('foo', 'new foo')
+  sbox.simple_add('foo')
+  sbox.simple_commit()
+
+  sbox.simple_rm('bar')
+  sbox.simple_copy('foo', 'bar')
+  sbox.simple_append('bar', 'new bar')
+  sbox.simple_commit()
+
 
 ########################################################################
 # Run the tests
@@ -3260,6 +3281,7 @@ test_list = [ None,
               commit_xml,
               commit_issue4722_checksum,
               commit_sees_tree_conflict_on_unversioned_path,
+              commit_replaced_file_with_mods,
              ]
 
 if __name__ == '__main__':