RE: Some sync merges no more allowed with 1.8 client ?

2013-07-08 Thread Eric Estievenart
On Mon, Jul 08, 2013 at 13:40, Stefan Sperling wrote: > You could rewrite history, creating copyfrom pointers in old revisions. > Create a new repository, create the common ancestor branch in the first > commit, create the other branches as copies, and then replay your existing > history on top

Re: Some sync merges no more allowed with 1.8 client ?

2013-07-08 Thread Stefan Sperling
On Mon, Jul 08, 2013 at 11:30:28AM +0200, Eric Estievenart wrote: > I'm currently investigating the details and implications of these horrors, > but I feel we are a bit doomed. You could rewrite history, creating copyfrom pointers in old revisions. Create a new repository, create the common ance

RE: Some sync merges no more allowed with 1.8 client ?

2013-07-08 Thread Eric Estievenart
Branko Čibej wrote on Fri, 05 Jul 2013 22:12:34 GMT: > Can you confirm that all the branches created by copying (svn copy) from the > source, as you've described in this diagram? Damn you are right. Some unexperimented people thought years ago that they were more clever than the system, created e

Re: Some sync merges no more allowed with 1.8 client ?

2013-07-06 Thread Daniel Shahaf
Eric Estievenart wrote on Fri, Jul 05, 2013 at 19:28:30 +0200: > svn: E205000: Try 'svn help merge' for more information > svn: E205000: Source and target must be different but related branches > svn: E205000: Source and target have no common ancestor: > 'svn://myserver/app/v1@head' and '.@unspeci

Re: Some sync merges no more allowed with 1.8 client ?

2013-07-05 Thread Branko Čibej
On 05.07.2013 19:28, Eric Estievenart wrote: > Of course the layout of the repository is historical and a bit complex; > I'll try to represent it here: (hoping you have a fixed font...) > > > /app/v2-dev/-- > /app/v2-candidate /---/---