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

Reintegration problem

From: David Aldrich <david.aldrich.ntml_at_gmail.com>
Date: Fri, 18 Jan 2019 12:31:12 +0000

Hi

I have a branch to which I have carefully merged all changes from the trunk
over the past year. Today I want to reintegrate the branch into the trunk.
When I attempt to do so I get error:

Reintegrate can only be used if revisions 8908 through 10479 were
previously merged from <snip>/trunk
to the reintegrate source, but this is not the case:
branches/TRY_NECA_01Feb2018/Simulations/Leda5G/RegressionTests/LEDA_DLBF_32Tx_8User_EPA5_MCS17_Rank2_RosellaBF.xml
Missing ranges:
/trunk/Simulations/Leda5G/RegressionTests/LEDA_DLBF_32Tx_8User_EPA5_MCS17_Rank2_RosellaBF.xml:9491

The merge info for the branch is:

/branches/TML_TRY_MassiveMIMO_25April2016:7280-8557
<snip>
/trunk:8908-10478

How should I fix this?

Why does the merge info contain information about branches when I have
always merged from the trunk?

Best regards

David
Received on 2019-01-18 13:43:32 CET

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