[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: Tom Lord <lord_at_emf.net>
Date: 2003-04-18 01:38:35 CEST

> From: "Jack Repenning" <jrepenning@collab.net>

> > In the general case, with absolutely no usage restrictions,
> > this is basically impossible.

> How so? If you merge the directories before you merge their contents,
> then you discover correspondences.

See my long reply to gstein. Briefly: there isn't a reasonable (easy
to explain/understand, user controllable, suitably flexible)
correlation between svn's directory-changing operations and the
programmer's idea of logical file correspondences.

With "ID cookies" -- the directory-changing commands can "do the right
thing" most of the time, while still giving users an easy out when the
right thing is something different.

-t

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Apr 18 01:27:41 2003

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