You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Madan U Sreenivasan <ma...@collab.net> on 2006/10/25 23:03:44 UTC
[PATCH][MERGE-TRACKING] Step 4 of recording copyfrom info in mergeinfo during a repos to repos copy
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.
Re: [PATCH][MERGE-TRACKING] Step 4 of recording copyfrom info in mergeinfo during a repos to repos copy
Posted by Madan U Sreenivasan <ma...@collab.net>.
On Thu, 26 Oct 2006 15:37:31 +0530, Kamesh Jayachandran
<ka...@collab.net> wrote:
> 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.
[snip]
> I am not in favour of os.path.join for URLs as it might result in the
> urls of the following form in windows,
[snip]
Both valid. Thank you. Will do the corrections.
> May be you can add a case where range of revisions getting implicitly
> recorded as merge as against one revision in the above example.
Sure. Makes sense.
Regards,
Madan.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH][MERGE-TRACKING] Step 4 of recording copyfrom info in
mergeinfo during a repos to repos copy
Posted by Kamesh Jayachandran <ka...@collab.net>.
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\D\B
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