RE: Branch synch merge from trunk fails with reintegrate error
From: Todd Armstrong <todd.armstrong_at_Newscycle.com>
Date: Wed, 13 Sep 2017 21:37:36 +0000
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.
Is it possible to install 1.9.x alongside 1.8.x on the same CentOS server where that server is only being used to run command line client working against a remote repository?
# pwd
# svn merge ^/apps/trunk/pim_at_8027 ^/apps/trunk/pim_at_9155 --dry-run
# svn merge ^/apps/trunk/pim_at_8027 ^/apps/trunk/pim_at_9155
-----Original Message-----
On Wed, Sep 13, 2017 at 05:25:22PM +0000, Todd Armstrong wrote:
What happens if you try this 2-URL merge instead?
svn merge ^/apps/trunk/pim_at_8027 ^/apps/trunk/pim_at_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.
It would be interesting to know if 'svn merge ^/apps/trunk/pim'
( By the way, based on its compiled date your SVN client is vulnerable to
|
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.