Hendrik Kueck wrote: > I am confused about how svnmerge deals with its own commits on > other branches. Let me clarify: Let's say I have one branch and > trunk and do bidirectional merging. I do a 'svnmerge block' on the > trunk to tell it that I want to ignore some revision of the branch. > I commit this change on the trunk. If I now go to the branch and do > a 'svnmerge avail -b" it will list this commit as available for > merging. It seems to me that ideally svnmerge should not even > display this commit. What happens if I accidentally or > intentionally merge such a svnmerge commit? Could this be harmful > in some circumstances?
If you are indeed using the -b flag, then it should not be showing that "reflected" revision. First of all, make sure you are using the latest trunk version of svnmerge.py. If the problem still occurs with that version, paste the output of svn pl --verbose trunk svn pl --verbose branch cd branch; svnmerge.py avail -b -S trunk Cheers, Raman Gupta _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
