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

Re: Problems merging renamed file with contents changes

From: <cmpilato_at_collab.net>
Date: 2002-09-12 19:56:06 CEST

"Bill Tutt" <rassilon@lyra.org> writes:

> > None of this requires major changes in libsvn_wc, fortunately. We
> > just
> >
> > 1) Add some metadata to entries, so that an `schedule=add' or
> > `schedule=delete' entry can also have a `renamed-from' or
> > `renamed-to' attribute, giving the URL of the companion item.
> >
> > 2) make harvest_committables notice all items that are part of a
> > rename, and check that the companion item is also part of that
> > commit.
> >
>
> 3) If companion items aren't part of the commit, then issue error, and
> abort commit.

Actually, Karl and Ben and I were saying exactly that before Karl
wrote his mail -- perhaps he just forgot that part.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 12 19:57:03 2002

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