Re: weird merge
From: Tyler Roscoe <tyler_at_cryptio.net>
Date: Fri, 26 Mar 2010 08:11:50 -0700
On Fri, Mar 26, 2010 at 03:17:54PM +0100, Xavier Noria wrote:
Are you using a merge-capable client and server (svn >= 1.5.0)?
What does svn say after you perform the record-only merge? Nothing?
> Another fact is that svn log in the branch contains everything down to r1.
What about svn log --stop-on-copy?
When was your branch created (what revision)?
This is an archived mail posted to the Subversion Users mailing list.