[PATCH][MERGE-TRACKING] Step 2 of repos to repos copy mergeinfo recording

[Madan U Sreenivasan <ma...@collab.net>]

Hi,

    Please find attached the step 2 of repos to repos copy mergeinfo  
recording. The following items are pending to complete the same:

    - Obtain the mergeinfo of the source from the repository and merge with  
the copyfrom info before
      recording the mergeinfo of the newly created node
    - Python tests to verify the same (of course, I test it too, but I have  
a handy shell script that does it for me now :)

    Also please note that if  
http://svn.haxx.se/dev/archive-2006-10/0205.shtml get committed, we could  
further simplify the get_copyfrom_merge_info() functions.

Regards,
Madan.

PS: Am a little unhappy with having to convert svn_stringbuf_t to  
svn_string_t in calculate_target_merge_info(). This is because  
svn_mergeinfo_to_string() returns a svn_stringbuf_t, while we need a  
svn_string_t to set the mergeinfo ( path_driver_cb_func() of  
subversion/libsvn_client/copy.c) requires a svn_string_t (for  
change_file_prop/change_dir_prop). I would be glad if somebody could tell  
me why we use two different versions of svn_string* even within our API -  
apart from the fact that stringbuf is 'growable' as the name implies.

Re: [PATCH][MERGE-TRACKING] Step 2 of repos to repos copy mergeinfo recording

[Daniel Rall <dl...@collab.net>]

On Tue, 24 Oct 2006, Madan S. wrote:

>    Please find attached the step 2 of repos to repos copy mergeinfo  
> recording. The following items are pending to complete the same:
> 
>    - Obtain the mergeinfo of the source from the repository and merge with  
> the copyfrom info before
>      recording the mergeinfo of the newly created node
>    - Python tests to verify the same (of course, I test it too, but I have  
> a handy shell script that does it for me now :)
> 
>    Also please note that if  
> http://svn.haxx.se/dev/archive-2006-10/0205.shtml get committed, we could  
> further simplify the get_copyfrom_merge_info() functions.

Madan and I worked together and fixed all the tests broken by this
patch.  I've committed a heavily modified version of the patch in
r22119.