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

[PATCH][MERGE-TRACKING] Step 4 of recording copyfrom info in mergeinfo during a repos to repos copy

From: Madan U Sreenivasan <madan_at_collab.net>
Date: 2006-10-26 01:03:44 CEST

Hi,

    Please find attached the 4th and final step in my endeavours to record
the copyfrom info into mergeinfo during a repos to repos copy.

    This step adds a python test for the same.

Regards,
Madan.

Step 4 of recording copyfrom history as mergeinfo on repos to repos copy.
This step adds a python test to explicitly test that repos to repos copy
does result in a mergeinfo that includes the copyfrom info of the source
path.

On the merge-tracking branch:

* subversion/tests/cmdline/merge_tests.py
  (copyfrom_merge_info_on_copy): New function to test for copyfrom info
   after a repos to repos copy.
  (test_list): Add the copyfrom_merge_info_on_copy() to the list of tests.

Index: subversion/tests/cmdline/merge_tests.py
===================================================================
--- subversion/tests/cmdline/merge_tests.py (revision 22115)
+++ subversion/tests/cmdline/merge_tests.py (working copy)
@@ -3889,6 +3889,28 @@
                                        expected_backup_status,
                                        expected_backup_skip)
 
+def copyfrom_merge_info_on_copy(sbox):
+ "test for copyfrom mergeinfo after copy"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ # repos to repos copy
+ B_URL = os.path.join(svntest.main.current_repo_url, 'A', 'B')
+ D_B_URL = os.path.join(svntest.main.current_repo_url, 'A', 'D', 'B')
+ C_B_URL = os.path.join(svntest.main.current_repo_url, 'A', 'C', 'B')
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'copy', B_URL, D_B_URL, '-m',
+ 'repos2repos cp:/A/B into /A/D/B')
+ svntest.actions.run_and_verify_svn(None, '/A/B:1\n', [], 'pg',
+ 'svn:mergeinfo', D_B_URL)
+
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'copy', D_B_URL, C_B_URL, '-m',
+ 'repos2repos cp: /A/D/B into /A/C/B')
+ svntest.actions.run_and_verify_svn(None, ['/A/B:1\n', '/A/D/B:2\n'],
+ [], 'pg', 'svn:mergeinfo', C_B_URL)
+
 ########################################################################
 # Run the tests
 
@@ -3933,6 +3955,7 @@
               merge_add_over_versioned_file_conflicts,
               merge_conflict_markers_matching_eol,
               XFail(merge_eolstyle_handling),
+ copyfrom_merge_info_on_copy,
              ]
 
 if __name__ == '__main__':

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 26 00:34:34 2006

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