Hi Subversion Gurus,
I have a question about merging with a tree conflict.
I created the same directory, called 'config' on two branches. The
directory had different files on each branch, let's call them 'foo.java'
on branch A and 'bar.java' on branch B.
When I merged branch A -> branch B, I got
On 05/24/2011 11:05 AM, Stefan Sperling wrote:
> On Tue, May 24, 2011 at 10:45:09AM -0400, David Tombs wrote:
>> Hi Subversion Gurus,
>>
>> I have a question about merging with a tree conflict.
>>
>> I created the same directory, called 'config' on t
On 05/25/2011 07:45 AM, Stephen Butler wrote:
> Hi David,
>
> Attached is a reproduction script. I could reproduce the corrupted working
> copy in 1.6.16.
>
> With 1.7 (r1127008), the corruption doesn't occur, but there's still a bug:
> 'svn status' displays bar.java (as deleted) after the merge
