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

Re: merge-tracking -- getting my feet wet

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-05-10 21:24:20 CEST

On 5/10/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
> I've extended the notification system to show multiple merges
> happening. Something like this:
>
> --- Merging r4 to 'trunk-wc':
> U trunk-wc/zcpu.py
> --- Merging r6:r7 to 'trunk-wc':
> U trunk-wc/zstring.py
>
> There's something odd going on, though. My test script does 3 commits
> to the branch (r4, r5, r6). I then port r5 to the trunk and commit,
> and finally let the 'magic' merge figure out the remaining ranges by
> doing 'svn merge branchURL trunk-wc'.
>
> The merge code should detect two ranges to merge: r4 and r6. But the
> svn_merge_range_t's it generates are weird: one is 'r4:r4', and the
> other is 'r6:r7'. The thing is, the correct changes seem to be ported
> anyway.
>
> Shouldn't the first range be 'r3:r4'? Why is r4:r4 behaving like r3:r4?
> Shouldn't the second range be 'r5:r6'? Why is r6:r7 behaving like r5:r6?

Based on your description, I would expect to see two "ranges" merged:

r4
r6 through HEAD.

I am assuming HEAD == r7

Furthermore, my "ranges" are expressing the revisions that are being
merged, not the typical N-1 range you would give the command.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu May 10 21:24:29 2007

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