[Svnmerge] [PATCH] Bidirectional merging patch for svnmerge.py

Giovanni Bajo rasky at develer.com
Wed Feb 22 01:31:48 PST 2006


Alan Barrett <apb at cequrux.com> wrote:

> For example, if the repository is currently at revision 123, and
> previous merges were performed at revisions 45, 87, and 102,
> then the merge that was performed at revision 102 might have set
> svnmerge-merges="/sourcebranch:45,87".  (It would not have known
> its own revision number, so it would not have been able to set
> svnmerge-merges="/sourcebranch:45,87,102".)  We now need to search
> from revision 88 to 123 looking for merges.

I see this as an additional optimization that can be done in a later step.
Also, such a property was already planned would be useful for other features
(like "svnmerge log" which is requested by users).
-- 
Giovanni Bajo




More information about the Svnmerge mailing list