Re: Branch synch merge from trunk fails with reintegrate error

2017-09-14 Thread Johan Corveleyn
On Thu, Sep 14, 2017 at 11:28 AM, Stefan Sperling wrote: ... > Note that you should use a separate working copy with the 1.9 client. > It cannot operate on the working copy created with 1.8. SVN 1.9 will ask > you to upgrade an existing working copy, but upgrading this working copy > will render i

Re: Branch synch merge from trunk fails with reintegrate error

2017-09-14 Thread Stefan Sperling
On Wed, Sep 13, 2017 at 09:37:36PM +, Todd Armstrong wrote: > 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 b

RE: Branch synch merge from trunk fails with reintegrate error

2017-09-13 Thread Todd Armstrong
. -Original Message- From: Stefan Sperling [mailto:s...@elego.de] Sent: Wednesday, September 13, 2017 1:48 PM To: Todd Armstrong Cc: users@subversion.apache.org Subject: Re: Branch synch merge from trunk fails with reintegrate error On Wed, Sep 13, 2017 at 05:25:22PM +, Todd Armstron

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