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

Re: filtering reflected merges is too sensitive

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-12-21 09:01:06 CET

Fixed in r28622 in issue-2897 branch.

With regards
Kamesh Jayachandran

Kamesh Jayachandran wrote:
>
>
> David Glasser wrote:
>> Hmm. What follows is the script I was using to test merge
>> --reintegrate, except that I took the --reintegrate off of the last
>> merge.
>>
>> I am surprised that the normal merge command does not try to merge r6
>> from branch to trunk.
>>
>> Why?
>>
>> I note that the merge from trunk to branch marks mergeinfo
>> "/trunk:2-6" (6 is a commit to branch only).
>>
>
> It does not matter, when you do a merge from /src to a target without
> revision numbers, range is assumed to be 'revision_at_which target is
> created':HEAD.
>
>> Is this something that Kamesh's branch does better?
>>
>
> Yes it should do, your script has triggered one edge case and hence
> fails while merging r7(reflective rev).
>
> I am converting this test to a testcase and will fix that.
>
> Thanks for the nice testcase.
>
> With regards
> Kamesh Jayachandran
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Dec 21 09:00:36 2007

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