On Jul 18, 2016, at 9:49, Andreas Stieger wrote:
> I wrote nothing of GUI.
Doh! I just saw the “UI” in capital letters and complete missed the “cli” in
lower case that preceded it - sorry about that! Anyway, I’m no closer in
resolving this merge issue, but will attempt to merge the revisions
Hello,
> > 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?
I wrote nothing of GUI.
Andreas
On Jul 18, 2016, at 3:00, Andreas Stieger 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 subtre
> $ svn pg svn:mergeinfo | grep branchA
> /branches/branchA:28000-29203
> $ svn pe svn:mergeinfo .
> Set new value for property 'svn:mergeinfo' on '.'
> $ svn pg svn:mergeinfo | grep branchA
> /branches/branchA:15542-29203
> $ svn mergeinfo ^/branches/branchA --show-revs=eligible
> [100’s of revi
So is it me or is there something broken here? A quick recap:
$ svn pg svn:mergeinfo | grep branchA
/branches/branchA:28000-29203
$ svn pe svn:mergeinfo .
Set new value for property 'svn:mergeinfo' on '.'
$ svn pg svn:mergeinfo | grep branchA
/branches/branchA:15542-29203
$ svn mergeinfo ^/branch
On Jul 15, 2016, at 3:02, Stefan Sperling wrote:
> I'm afraid it's not obvious to me what issue you are referring to.
>
> Which behaviour are you expecting, and how does Subversion not meet
> your expectations?
I expect Subversion to merge only revisions 29203:HEAD of branchA into
branchB. Why
On Thu, Jul 14, 2016 at 09:38:05PM -0400, Alfred von Campe wrote:
> 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:mer
