[Svnmerge] [PATCH] Bidirectional patch take 2

[Alan Barrett]

On Fri, 24 Feb 2006, Giovanni Bajo wrote:
> I had thought about doing some caching. The problem is that "svnmerge
> avail" is a command which does not modify your working copy, and I'm
> not inclined on modifying this behaviour.

Sure.  But svnmerge merge has to repeat much of the work, and
is allowed to modify the WC.

> /trunk:1-100,120-123,135-138,150
> 
> The revisions that have been marked as integrated (120-123 and
> 135-138) are either phantom or reflected revisions. svnmerge has then
> already analyzed the range 100-150, and there is no need to log it
> anymore for this purpose.

This assumption is safe only if you know that the svnmerge-integrated
property was created by a version of svnmerge that knew to add reflected
revisions to the integrated list.  If you create a new property that old
code doesn't know about, then you can make more assumptions about how
new the code was when the property was updated.  (I suggested storing
a list of available revisions in a property, but storing a list of
reflected revisions would probably be better.)

--apb (Alan Barrett)