Tilmann Singer wrote: >>>> Also I would appreciate suggestions how to fix our current value of >>>> svnmerge-integrated. Should I just insert the forgotten revisions in >>>> order, separated by commas? Or would it be necessary to concatenate >>>> consecutive revs into ranges? >> Use 'svnmerge.py merge -rN --record-only' to adjust the merge history >> for a merge source without performing the actual merge. > > Thanks. Apparently we were using a version where this option did not > yet exist - unfortunately downloaded directly so the version keyword > was not expanded inside the script.
You can use svn cat on the $ svn cat \ http://svn.collab.net/repos/svn/trunk/contrib/client-side/svnmerge.py \ > svnmerge.py $ chmod a+x svnmerge.py to get the keyword expansions. Regards, Blair -- Blair Zajac, Ph.D. http://www.orcaware.com/svn/ _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
