[Svnmerge] [PATCH] Bidirectional patch take 2

[Blair Zajac]

On Feb 24, 2006, at 11:49 PM, Alan Barrett wrote:

> On Fri, 24 Feb 2006, Giovanni Bajo wrote:
>> I don't think it makes sense to add more properties just for backward
>> compatibility. I'd rather have a way to identify and fix the old  
>> versions,
>> and then use the property the way I like. What I like is to store  
>> reflected
>> revisions into the integrated property, much like phantom  
>> revisions are. So
>> what about adding a "svnmerge-integrated-version: 2", that we can  
>> bump each
>> time we change the property format? Notice: this doubles the work of
>> get_revlist_prop (also in the case of --bidirectional). Otherwise,  
>> we could
>> add metadata to the existing property like "revision:2"...  
>> Suggestions?
>
> Either of those works, and I don't think there's much difference
> in efficiency.  (The version property will not change without the
> integrated property also changing, and get_revlist_prop can take
> advantage of this knowledge.)

Two things for having it all in one property:

1) If a newer version of svnmerge.py is run and then an older version  
is used against the repository, changing the format in the svnmerge- 
integrated property will hopefully cause a problem, while a separate  
property will go ignored by the older svnmerge.py, and may not make  
the same assumptions about the revisions list  there.

2) It'll save at least one or more hits against the repository.

Regards,
Blair