Re: Symmetric merge -- current test failures when enabled

2012-05-10 Thread Julian Foad
- Original Message - > From: Branko Čibej > To: dev@subversion.apache.org > Cc: > Sent: Thursday, 10 May 2012, 8:58 > Subject: Re: Symmetric merge -- current test failures when enabled > > On 10.05.2012 09:36, Julian Foad wrote: >> Branko Čibej wrote: >>&g

Re: Symmetric merge -- current test failures when enabled

2012-05-10 Thread Branko Čibej
On 10.05.2012 09:36, Julian Foad wrote: > Branko Čibej wrote: >> On 09.05.2012 18:54, Julian Foad wrote: >>> The second group concerns merging changes into a file from its own (past >>> or >> future) history; this kind of merge isn't a 'sync' so shouldn't >> be handled by this code path. >> >>

Re: Symmetric merge -- current test failures when enabled

2012-05-10 Thread Julian Foad
Branko Čibej wrote: > On 09.05.2012 18:54, Julian Foad wrote: >> The second group concerns merging changes into a file from its own (past or > future) history; this kind of merge isn't a 'sync' so shouldn't > be handled by this code path. > > We keep coming back to this ... I still don't unders

Re: Symmetric merge -- current test failures when enabled

2012-05-09 Thread Branko Čibej
On 09.05.2012 18:54, Julian Foad wrote: > The second group concerns merging changes into a file from its own (past or > future) history; this kind of merge isn't a 'sync' so shouldn't be handled by > this code path. We keep coming back to this ... I still don't understand /why/ we would need mor

Symmetric merge -- current test failures when enabled

2012-05-09 Thread Julian Foad
In r1336079 I updated the symmetric merge base-finding code to properly follow branches that have been renamed (which includes being branched off another branch) during their lifetime. Currently there are 12 test failures, of just three kinds, in the existing test suite, when I make the symmetr