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

Re: svn commit: r27939 - in trunk/subversion: libsvn_client tests/cmdline

From: Daniel L. Rall <dlr_at_finemaltcoding.com>
Date: 2007-11-21 07:49:51 CET

On Wed, 21 Nov 2007, C. Michael Pilato wrote:

> Daniel L. Rall wrote:
> > On Tue, 20 Nov 2007, C. Michael Pilato wrote:
> >
> >> Daniel L. Rall wrote:
> >>> On Mon, 19 Nov 2007, cmpilato@tigris.org wrote:
> >>>
> >>>> Author: cmpilato
> >>>> Date: Mon Nov 19 20:28:57 2007
> >>>> New Revision: 27939
...
> >>>> @@ -3494,6 +3530,12 @@
> >>>> apr_pool_t *subpool;
> >>>> svn_boolean_t is_rollback = (revision1 > revision2);
> >>>> const char *primary_url = is_rollback ? url1 : url2;
> >>>> + svn_boolean_t honor_mergeinfo = (merge_b->sources_related
> >>>> + && merge_b->same_repos
> >>>> + && (! merge_b->ignore_ancestry));
> >>>> + svn_boolean_t record_mergeinfo = (merge_b->sources_related
> >>>> + && merge_b->same_repos
> >>>> + && (! merge_b->dry_run));
> >>> Mike, shouldn't sources_related (currently) imply same_repos?
> >> I would have thought so, but apparently not. We have a regression test
> >> aimed specifically at supporting merges from one repository into a working
> >> copy of another repository altogether.
> >
> > We currently allow merging from one repository into another's WC (e.g. to
> > support vendor branches), but we can't consider -- and so also shouldn't
> > record -- mergeinfo in these cases, because we don't record a repository URL,
> > only a path relative to the current repository.
>
> Right.
>
> I can't tell if you are trying to educate me or correct me. Was there a
> problem with what I said?
>
> You do realize that sources_related means "the left and right side of the
> merge have an ancestral relationship", and same_repos means "the sources of
> the merge come from the same repository as the target working copy", right?
> So, sources_related and same_repos are truly independent of one another.

Mike and I cleared up this misunderstanding on IRC. To paraphrase his
explanation, the WC doesn't come into the picture for sources_related,
which is only referring to the left and right side locations of the merge,
not to any relation between the WC and the "merge from" locations.

  • application/pgp-signature attachment: stored
Received on Wed Nov 21 07:57:45 2007

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