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

Branch synch merge from trunk fails with reintegrate error

From: Todd Armstrong <todd.armstrong_at_Newscycle.com>
Date: Wed, 13 Sep 2017 17:25:22 +0000

I am attempting to merge updates to trunk (^/apps/trunk/pim) that were merged up from the branch of last year's version where they originally made (^/apps/branches/2016/pim) down into the branch of the current year's version (^/apps/branches/2017/pim) and I am getting an error indicating I can't do a re-integrate merge, which I don't think I'm trying to do. The current year's branch was created from trunk as of revision 8026, which is the revision before the beginning of the revision range given in the reintegrate error message.

It seems to me this should be doing a synch merge from trunk down to branch and since the current year's version and the trunk both have changes to a couple of the same files after the branch for the current year's version was created, I expected to instead be getting a conflict to resolve.

Am I misunderstanding something about how a merge update from trunk to branch is supposed to work? If not, how do I make it work as I expect?

# pwd
/u/delta/pim/42
^^ base directory of working copy for current version's branch)

# svn merge ^/apps/trunk/pim --dry-run
^^ related URL path in trunk
svn: E195016: Reintegrate can only be used if revisions 8027 through 9155 were previously merged from http://source.newscyclesolutions.com/svn/commerce/circulation/apps/branches/2017/delta/pim to the reintegrate source, but this is not the case:
  apps/trunk/pim
    Missing ranges: /apps/branches/2017/delta/pim:8027

I'm using the command line client (1.8.16) on CentOS 6.8.
# svn --version
svn, version 1.8.16 (r1740329)
   compiled Jul 6 2016, 11:38:59 on x86_64-redhat-linux-gnu

In case it's useful, here's mergeinfo regarding the current year's branch and trunk and some related log details....

From branch working copy:
# pwd
/u/delta/pim/42

# svn mergeinfo ^/apps/trunk/pim
    youngest common ancestor
    | last full merge
    | | tip of branch
    | | | repository path

    8026 9155
    | |
  -------| |------------ apps/trunk/pim
     \ /
      \ /
       --| |------------ apps/branches/2017/delta/pim
              | |
              8066 8328

# svn log version -v | more
------------------------------------------------------------------------
r8066 | gah | 2017-03-22 12:31:20 -0500 (Wed, 22 Mar 2017) | 1 line
Changed paths:
   M /apps/branches/2017/delta/pim
   M /apps/branches/2017/delta/pim/version

Updating version
------------------------------------------------------------------------
r8027 | prf | 2017-03-21 20:58:57 -0500 (Tue, 21 Mar 2017) | 1 line
Changed paths:
   A /apps/branches/2017/delta/pim (from /apps/trunk/pim:8026)

Creating 2017 delta area
------------------------------------------------------------------------
r3846 | prf | 2015-05-27 13:07:33 -0500 (Wed, 27 May 2015) | 1 line
Changed paths:
   M /apps/trunk/pim
   D /apps/trunk/pim/session
   M /apps/trunk/pim/tools/cmsource.p
   M /apps/trunk/pim/version

From trunk working copy:

# pwd
/u/src/pim/42

# svn mergeinfo ^/apps/branches/2017/delta/pim
    youngest common ancestor
    | last full merge
    | | tip of branch
    | | | repository path

    8026 8066 9155
    | | |
       --| |------------ apps/branches/2017/delta/pim
      / \
     / \
  -------| |------------ apps/trunk/pim
                       |
                       9154

# svn log version -v | more
------------------------------------------------------------------------
r8178 | tja | 2017-04-10 17:47:06 -0500 (Mon, 10 Apr 2017) | 1 line
Changed paths:
   M /apps/trunk/pim
   M /apps/trunk/pim/batchlevel
   M /apps/trunk/pim/svn.ignore.me
   M /apps/trunk/pim/version

CM-12814: Update PIM area of trunk to /u/src/pim/41 checkout compatible 41a2 lev
el.
------------------------------------------------------------------------
r8067 | prf | 2017-03-22 12:33:13 -0500 (Wed, 22 Mar 2017) | 1 line
Changed paths:
   M /apps/trunk/pim
   M /apps/trunk/pim/version

Updating version
------------------------------------------------------------------------
r3846 | prf | 2015-05-27 13:07:33 -0500 (Wed, 27 May 2015) | 1 line
Changed paths:
   M /apps/trunk/pim
   D /apps/trunk/pim/session
   M /apps/trunk/pim/tools/cmsource.p
   M /apps/trunk/pim/version

Thanks,
Todd

Todd Armstrong / Senior Software Engineer

Newscyle Commerce<http://newscycle.com/solutions/circulation-subscription-management-system/#_SubscriptionLink>
Received on 2017-09-13 19:25:40 CEST

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