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

Re: short question about merge [PROPOSAL] vs. tree-deltas

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-04-17 00:46:46 CEST

Branko ─Œibej <brane@xbc.nu> writes:

> >At present two files can only share the same node revision id if they
> >are the result of copying directories, in which case the files will
> >have the same basename. So
> >
> > dir1/file1 == node_N.copy_C.rev_R
> > dir2/file1 == node_N.copy_C.rev_R
> >
> >can occur.
> >
>
> Yes, that can occur... (sorry Sander, I didn't think of lazy copying).
> However, in that case, it's the same file, there's nothing to merge

I was simply responding to Sander's point, but from a brief look at
Tom's scenario it appears that the file names don't really matter. So
whether these two files have the same basename doesn't affect the his
question.

> >It's possible that when (or should that be if?) atomic move gets
> >implemented then the original scenario will occur.
> >
> >
> No, Bill Tutt thought up a way to avoid this, and IIRC it's already
> implemented in his branch.

Hmmm. I thought atomic move was intended to lead to exactly that sort
of duplication, but I only ever used Bill's original 1003 branch, I
haven't looked at Mike's newer branch.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Apr 17 00:47:29 2003

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