On Wed, Sep 13, 2017 at 05:25:22PM +0000, 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/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
What happens if you try this 2-URL merge instead? svn merge ^/apps/trunk/pim@8027 ^/apps/trunk/pim@9155 --dry-run Does this command run the sync merge you expect? > 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 It would be interesting to know if 'svn merge ^/apps/trunk/pim' with a Subversion 1.9.7 client produces the same 'reintegrate' error. Perhaps this is a bug which has been fixed in 1.9? ( By the way, based on its compiled date your SVN client is vulnerable to CVS-2017-9800: https://subversion.apache.org/security/CVE-2017-9800-advisory.txt Applying the "ssh -q --" workaround mentioned there to your client's configuration file should be enough to prevent an exploit. )
