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

E195016 on trying a normal merge / is_reintegrate_like determined correctly?

From: Stefan Hett <stefan_at_egosoft.com>
Date: Fri, 28 Aug 2015 21:03:04 +0200


running the attached test script brings up the following error:
"E195016: Reintegrate can only be used if revisions 2 through 8 were
previously merged from [branchURL] to the reintegrate source, but this
is not the case:
         Missing ranges: branches/A:2,5"

The weird thing here (at least weird in my understanding) is that it
tries to do a reintegration merge even though I'm trying to perform a
catach-up merge with trunk on the branch.

Looking at merge.c at line 12462 the following if-check determines it's
a "reintegrate-like" merge and therefore tries to do a reintegration
merge, instead of a "normal" merge:
if (base_on_source->rev >= base_on_target->rev)

base_on_source->rev = 3
base_on_target->rev = 4

I'm wondering whether this if-check suffices here to determine whether
it is a reintegration merge or not, given my test-scenario which has
cherry-picked revisions in both directions (trunk <-> branch).
To me it looks like the check relies on cherry-picking only being
performed in one or the other direction, because otherwise the
"youngest-complete-synced-point" couldn't be used to determine the
direction for reintegration merges...
Or am I missing something?

Sorry if I'm completely off here --- not too familiar with all the
details of the automerge and it's twisiting my brain trying to
follow/interpret the design details from code.

Stefan Hett

Received on 2015-08-28 21:03:10 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.