Hi, I have what I would imagine is a very common svnmerge setup - I have it set up to track changes between the trunk and a release branch, and vice-versa. Up until now I've found it incredibly useful.
Recently I added some new features to trunk which did not belong in the release branch. I ran svnmerge.py block -r <rev> on a clean working copy of the release branch and committed this change. However, when I go back to trunk and run svnmerge.py avail -b the change to this property shows up as a possible merge. Obviously, if I block this revision and commit that change, the next commit shows up as a possible merge for the branch, and so on. I was using the 1.4 branch of svnmerge.py, and this morning upgraded to the trunk version, but I am still having the same problem. Am I doing something wrong? Any help greatly appreciated! Steve -- Steven Shanks Systems Developer Valley Technology Ltd. _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
