RE: Branch synch merge from trunk fails with reintegrate error

2017-09-13 Thread Todd Armstrong
Stefan, Thanks. The two URL merge worked - I haven't needed that one before so some reading seems to be in order to understand why of needing to use this- is http://subversion.apache.org/docs/svn-merge.txt option 3 the best reference? Also, thanks for the heads up on the security patch. I

Re: Branch synch merge from trunk fails with reintegrate error

2017-09-13 Thread Stefan Sperling
On Wed, Sep 13, 2017 at 05:25:22PM +, Todd Armstrong wrote: > # 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/cir

Branch synch merge from trunk fails with reintegrate error

2017-09-13 Thread Todd Armstrong
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