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

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

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2006-10-26 12:07:31 CEST

Madan U Sreenivasan wrote:
> +def copyfrom_merge_info_on_copy(sbox):
> + "test for copyfrom mergeinfo after copy"
> +
> + sbox.build()
> + wc_dir = sbox.wc_dir
As you don't do any wc operations here 'wc_dir' is a unused variable.
> +
> + # 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')
I am not in favour of os.path.join for URLs as it might result in the
urls of the following form in windows,
file:///dira/dirb/dirc/repo_name\A\B (See the mixed '/' and '\')
file:///dira/dirb/dirc/repo_name\A\C\B which seem to work fine for
checkout(but with a difference being checkout WC being 'repo_name\A\B',
'repo_name\A\D\B', 'repo_name\A\C\B' as against the 'B', 'B', 'B'
Probably other commands might behave strangely here.
> + 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)
Use SVN_PROP_MERGE_INFO instead of 'svn:mergeinfo'.

May be you can add a case where range of revisions getting implicitly
recorded as merge as against one revision in the above example.

With regards
Kamesh Jayachanadran

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

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.