[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: David Glasser <glasser_at_davidglasser.net>
Date: Tue, 4 Mar 2008 08:58:07 -0800

On Tue, Mar 4, 2008 at 8:54 AM, Mark Phippard <markphip_at_gmail.com> wrote:
> On Tue, Mar 4, 2008 at 11:52 AM, David Glasser <glasser_at_davidglasser.net> wrote:
> > On Tue, Mar 4, 2008 at 8:46 AM, Mark Phippard <markphip_at_gmail.com> wrote:
>
>
> > > Paul touched on that. The issue is that merge is like an edit of the
> > > working copy. On Windows and OSX, you cannot do a case only-rename of
> > > a file. You can receive an update because it is altering the working
> > > copy as it goes.
> >
> > Sorry, I don't follow. How does a merge not act like an update here?
>
> Merge can be reverted, so both copies of the file need to remain in
> the WC text-base.

Oh, right! The issue is the text-base! Sorry, I didn't completely follow.

(wc 2.0 can solve this isssue by storing text-bases (and any other
pieces of content worth tracking) in a content-hash-addressable
store.)

--dave

-- 
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
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 17:58:22 CET

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