epg@tigris.org writes:
> Rewrite the FSFS auto-merge to use a much simpler algorithm, avoiding
> expensive predecessor walks. The old code was written for the old
> (pre-r624) commit system, which could supply an earlier ancestor to
> merge() than the head revision at the time the target transaction was
> started. This meant the code had to deal with commonality between the
> changes in source and the changes in target. In particular, the old
> code allowed:
I can't dive into your change right now, so let me just ask some
questions about this change and beg that if the answers are obvious,
you'll be gracious.
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? You
*may not* introduce into our commit system the assumption that commit
transactions are always based on the HEAD revision. The APIs allow
otherwise (as was demonstrated pre-r624). If your commit doesn't
make these assumptions, that's excellent.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Mar 2 03:41:28 2005