[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: Sander Striker <striker_at_apache.org>
Date: 2003-04-16 23:15:38 CEST

> From: Tom Lord [mailto:lord@emf.net]
> Sent: Wednesday, April 16, 2003 2:28 AM

> v.a.p. looks at a revision tree like this:
>
>
> ANCESTOR
> / \
> ... ...
> / \
> ORIG TARGET
> ...
> /
> MOD
>
>
> 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.

Sander

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Apr 16 23:16:23 2003

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