[Svnmerge] [PATCH] Bidirectional patch take 2

Alan Barrett apb at cequrux.com
Fri Feb 24 23:49:10 PST 2006


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

--apb (Alan Barrett)



More information about the Svnmerge mailing list