Re: svn diff, svn merge, and vendor branches (long)

Greg Hudson <ghudson@MIT.EDU> writes:

> I guess the relevant question is in merge. If we are merging "delete
> foo and replace foo with unrelated file" with "modify the contents of
> foo", then we should get a directory-level conflict; my proposed change
> would produce a file-level merge. So I guess we can throw out my idea.

Mmm, yah. Crud. If someone really replaced a file, and you're
merging that change into your working copy, then this is the
difference between ending up with an 'M' versus an 'A +'. This is
about the only case where the working copy actually tracks ancestry.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Dec 9 20:03:40 2002