Re: svn commit: r13222 - in trunk: . subversion/libsvn_fs_fs

On Tue, 2005-03-01 at 21:38, C. Michael Pilato wrote:
> How does this play with the public svn_fs_merge() function, which
> *still* allows folks to supply an earlier ancestor to merge() than the
> head revision at the time the target transaction was started?

svn_fs_merge() will be using the new algorithm. We could decouple
svn_fs_merge() so that it runs the old code, but I think that would be a
mistake.

> You
> *may not* introduce into our commit system the assumption that commit
> transactions are always based on the HEAD revision.

You can make and commit a transaction based on any revision you want.
What you can't do any more is make a transaction based on an old
revision, duplicate some of the changes made since then in the
repository, make some additional changes yourself, and expect not to see
any conflicts between your duplicated changes and the ones made since
then.

I don't see anything in the svn_fs_merge() docstring to indicate that
this ought to work.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Mar 2 04:08:13 2005