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

Re: Merging multi-source copy/move into the merge-tracking branch

From: Madan U S <madan_at_collab.net>
Date: 2006-12-26 17:28:31 CET

On Fri, 22 Dec 2006 04:46:17 +0530, Daniel Rall <dlr@collab.net> wrote:

> Hyrum and Madan, there were some conflicts on the merge-tracking after
> I merged in the multi-source copy/move code from trunk. I think I've
> got a reasonable resolution approach here, but was hoping you could
> verify with the attached patch. Look for "mergeinfo" in the diff.
>
> Main points:
>
> - mergeinfo member moved from path_driver_cb_baton to path_driver_info
>
> - calculate_target_merge_info() now called in a loop for each copy
> sources. I moved the "Setup our PATHS for the path-based editor
> drive" loop up above svn_ra_get_commit_editor2() call, which is a
> change in fail-fast behavior.

Looks fine to me.

Regards,
Madan.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Dec 26 17:28:41 2006

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