Strange merge problem
From: Alfred von Campe <alfred_at_von-campe.com>
Date: Thu, 14 Jul 2016 21:38:05 -0400
A user at work came to me with a strange merge issue and I have been able to reproduce it. This happens with both a 1.8.16 and 1.9.4 Linux CLI client. I usually can resolve these merge issues by deleting superfluous svn:mergeinfo properties in subdirectories and/or by editing the svn:mergeinfo property, but nothing works in this case. Here is some information I captured; the only thing that has been altered is the name of the branches to protect our data. All commands were performed in a fresh checkout of the tip of branchB.
TIA for any help or hints to help resolve this issue.
Alfred
$ svn mergeinfo ^/branches/branchA
15542 29501
|
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.