Hi,
an anonymous contributor sent the attached patch to me. Basically, the
patch allows more revisions which modify the svnmerge-block property to
disappear from svnmerge avail. Specifically, consider the transitive case:
C merges from B merges from A
Commit r100 into A.
Block r100 into B (= r101)
svnmerge avail in C -> shows r101
Comments?
--
Giovanni Bajo
Index: svnmerge.py
===================================================================
--- svnmerge.py (revision 27790)
+++ svnmerge.py (working copy)
@@ -1049,7 +1049,7 @@
if find_reflected:
reflected_revs = logs[url].merge_metadata().changed_revs(target_pathid)
- reflected_revs +=
logs[url].block_metadata().changed_revs(target_pathid)
+ reflected_revs += logs[url].block_metadata().changed_revs()
else:
reflected_revs = []
_______________________________________________
Svnmerge mailing list
[email protected]
http://www.orcaware.com/mailman/listinfo/svnmerge
