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

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

From: Daniel Rall <dlr_at_collab.net>
Date: 2006-08-04 02:08:10 CEST

On Thu, 03 Aug 2006, Kamesh Jayachandran wrote:
...
> >Log:
> >On the merge-tracking branch: Incremental progress towards
> >notification handling. Not yet fully functional, but not expected to
> >break any previously working tests, either.
> >
> >* subversion/libsvn_client/diff.c
...
> > (update_wc_merge_info): Rewrite this function to handle empty merge
> > info, and re-purpose it to be called once per merge of an
> > incremental revision range (as opposed to once after all revision
> > ranges have been merged). While somewhat less efficient, this is
> > seems to be necessary to properly handle WC notifications.
...
> >+/* Calculate the new merge info for the target tree based on the merge
> >+ info for TARGET_WCPATH and MERGES (a mapping of WC paths to range
> >+ lists), and record it in the WC (at, and possibly below,
> >+ TARGET_WCPATH). */
> > static svn_error_t *
> > update_wc_merge_info(const char *target_wcpath, const svn_wc_entry_t
> > *entry,
> >- const char *rel_path, apr_array_header_t *ranges,
> >- svn_boolean_t is_revert, svn_wc_adm_access_t
> >*adm_access,
> >+ const char *repos_rel_path, apr_hash_t *merges,
> >+ svn_boolean_t is_revert, svn_ra_session_t
> >*ra_session,
>
> I could not see ra_session used anywhere? Is it needed?

While it's not currently used in update_wc_merge_info(), it may be
necessary for retrieving any merge info from the repository for paths
other than target_wcpath which we want to set the merge info for.

If it's not, we'll remove it. As probably evident from the change
log, this was more of a checkpoint commit -- I've had various
incarnations of this patch in my WC for weeks, and wanted to get it
under VC.

  • application/pgp-signature attachment: stored
Received on Fri Aug 4 02:09:39 2006

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