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

"Sander Striker" <striker@apache.org> writes:

> > From: Tom Lord [mailto:lord@emf.net]
> > Sent: Wednesday, April 16, 2003 2:28 AM
> >
> > Let's suppose that the trees for ANCESTOR and ORIG have:
> >
> >
> > dir1/file1 == node_N.copy_C.rev_R
> > dir2/file2 == node_N.copy_C.rev_R
> >
> > (Note that the two file-rev nodes are identical.)
>
> This can't happen AFAIK.

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.

It's possible that when (or should that be if?) atomic move gets
implemented then the original scenario will occur.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org