[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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:
> Even if I try to fix it by hand with
>
> svn merge -r2:2909 ^/trunk --record-only
>
> a subsequent merge still tries to get 2 through 2909. Moreover
>
> svn propget svn:mergeinfo .
>
> returns nothing.

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)?

tyler
Received on 2010-03-26 16:12:22 CET

This is an archived mail posted to the Subversion Users mailing list.