> On Fri, Mar 26, 2010 at 5:11 PM, Tyler Roscoe <ty...@cryptio.net> wrote: > > > 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
Did you do a commit after doing the --record-only merge? BOb > >> > >> svn propget svn:mergeinfo . > >> > >> returns nothing. > > > > Are you using a merge-capable client and server (svn >= 1.5.0)? > > Yes, server is 1.5.1 (r32289) and client is 1.6.5 (r38866). > > > What does svn say after you perform the record-only merge? Nothing? > > Nothing, silent. > > >> 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)? > > I am doing ad-hoc tests with temporary branches I can throw. For > example the last one was created from trunk r28935 and now trunk is > r28939. > > Indeed if you want me to try something please just tell me, I can > create whatever, test stuff and delete later. > > I don't know whether this is relevant, but we are not creating the > branches exactly below the branches directory, but in a subdirectory > of it.
