Re: Strange merge problem
From: Alfred von Campe <alfred_at_von-campe.com>
Date: Mon, 18 Jul 2016 09:29:48 -0400
On Jul 18, 2016, at 3:00, Andreas Stieger <andreas.stieger_at_gmx.de> wrote:
> Commonly caused by explicit subtree mergeinfo. Check for svn:mergeinfo properties set on subtrees for both the merge source and the merge target.
Unfortunately that’s not the case here. While there was one svn:mergeinfo property in a subtree, removing it made no difference.
> Ideally use svn cli UI only.
Really? I’ve had better luck using the CLI for merges. So what GUI do you recommend using on Linux?
Alfred
|
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.