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
# svn merge ^/apps/trunk/pim --dry-run
I'm using the command line client (1.8.16) on CentOS 6.8.
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:
# svn mergeinfo ^/apps/trunk/pim
8026 9155
# svn log version -v | more
Updating version
Creating 2017 delta area
From trunk working copy:
# pwd
# svn mergeinfo ^/apps/branches/2017/delta/pim
8026 8066 9155
# svn log version -v | more
CM-12814: Update PIM area of trunk to /u/src/pim/41 checkout compatible 41a2 lev
Updating version
Thanks,
Todd Armstrong / Senior Software Engineer
Newscyle Commerce<http://newscycle.com/solutions/circulation-subscription-management-system/#_SubscriptionLink>
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.