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

Re: svn commit: r23565 - branches/merge-tracking/subversion/libsvn_client

From: Malcolm Rowe <malcolm-svn-dev_at_farside.org.uk>
Date: 2007-03-05 06:36:01 CET

On Sun, Mar 04, 2007 at 09:27:09PM -0800, pburba@tigris.org wrote:
> On the On the merge-tracking branch: Follow-up to r23260, 23423, fix potential
> loss of mergeinfo during wc-to-repos and repos-to-wc copies.

"On the On the"? :-)

> * subversion/libsvn_client/copy.c
> (extend_wc_merge_info, wc_to_repos_copy): svn_mergeinfo_merge() creates a new
> apr_hash_t * for its output hash, so don't make *output the same as either
> of the hashes being merged or the mergeinfo in that hash will be lost.
>

Maybe the signature of svn_mergeinfo_merge() should change to only
accept two hashes, and merge the latter into the former, if that's the
common case? (you could always decide to clone the destination hash
first, if you decided you needed to keep a copy around).

Regards,
Malcolm

  • application/pgp-signature attachment: stored
Received on Mon Mar 5 06:36:20 2007

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