[Svnmerge] [PATCH] Bidirectional patch take 2

[Giovanni Bajo]

Alan Barrett <apb at cequrux.com> wrote:

>> 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.

Good point.

> 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.)


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?
-- 
Giovanni Bajo