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

Re: Summary of discussions that occured on issue 2897 -Part 2 (Folker's concern over mergeinfo)

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-12-10 08:31:16 CET

Folker Schamel wrote:
> Kamesh Jayachandran wrote:
>> Hi All,
>>
>> Attached test4.sh represents the problem raised by Folker on
>> mergeinfo scheme at
>> http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=133164.
>>
>> In the example given by Folker ,
>>
>> <snip on working copy after execution of above script>
>> [kamesh@kamesh tmp]$ /home/kamesh/issue-2897-fix/bin/svn pl -v
>> wc/repos/trunk
>> Properties on 'wc/repos/trunk':
>> svn:mergeinfo : /release:2-8
>> /stable:3-9
>> [kamesh@kamesh tmp]$ /home/kamesh/issue-2897-fix/bin/svn pl -v
>> wc/repos/feature/
>> Properties on 'wc/repos/feature':
>> svn:mergeinfo : /release:2-8
>> /stable:3-10
>> </snip>
>>
>> $SVN merge file:///tmp/repos/trunk feature
>>
>> Here 'feature' has no *direct* mergeinfo from '/trunk' and hence does
>> not bother about avoiding repeat merge.
>>
>> What we need to do is find the common-mergeinfo between merge source
>> and target and find the reflections on those common revs *treat those
>> reflections* specially by extracting the *non reflective changes out
>> of them.*.
>
> This and your comments in your previous email all look very plausible
> to me.
> You seem to think basically about the same problems I was thinking about.
>

Yes.

> But trying to understand you last sentence:
> What are the "non reflective changes out of them" in this particular
> case?

With respect to 'the last merge of trunk to feature' described at
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=133164
I mean by 'non-reflective changes from direct/indirect reflections' is
RSTfix.

With regards
Kamesh Jayachandran

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Dec 10 08:50:48 2007

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