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

Re: Case only rename during merge breaks WC

From: Mark Phippard <markphip_at_gmail.com>
Date: Mon, 3 Mar 2008 21:46:59 -0500

On Mon, Mar 3, 2008 at 8:42 PM, Paul Burba <ptburba_at_gmail.com> wrote:

> The problem is that the whole tree rooted at 'A_COPY' gets locked at
> the start of the merge. Then the svn_wc_diff_callbacks2_t callback
> merge_dir_added() doesn't find 'A_COPY/d' in the admin access (since
> that *is* case sensitive) and not finding it attempts to open a new
> access, but in doing so runs into the existing 'A_COPY/D'. I haven't
> thought much on how to solve this; I want to solve the simpler file
> case first.

I think it is relevant to know if this behavior is any different from 1.4.

Mark Phippard
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-03-04 19:57:58 CET

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