Nevermind. I thought this was also about the general case. Looking back in the archives, I see the general case was already fixed.
I was using an old version of svnmerge that didn't handle the general case. I upgraded to the latest svnmerge from trunk but it still showed the blocking revisions when I did 'svnmerge avail -b'. However, upon blocking those revisions using the new svmerge, the new blocking revision disappears from the 'svnmerge avail -b' (on the opposing branch). -Tim On Thu, 7 Feb 2008 17:05:03 +0000 (UTC) Tim Olsen <[EMAIL PROTECTED]> wrote: > Raman Gupta <[EMAIL PROTECTED]> writes: > > Giovanni Bajo wrote: > > > 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: > <snip> > > I can't think of a reason not to do this. In fact, is there a > > reason not to apply the same change to the merged revisions also? > > Let's say you have 1.0.x branch and a 1.1.x branch. you might want > to block certain revisions from going from trunk to 1.0.x but not > block them from going from 1.1.x. If we merge to trunk the revision > blocking said trunk revisions, then the block will eventually migrate > to the 1.1.x branch. > > Maybe offer an option (similar to -b) which removes blocking > revisions of this sort? > > -Tim > > _______________________________________________ > Svnmerge mailing list > [email protected] > http://www.orcaware.com/mailman/listinfo/svnmerge _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
