Rich Williams wrote: > On 9/21/06, Raman Gupta <[EMAIL PROTECTED]> wrote: >> > On Wed, 20 Sep 2006, Rich Williams wrote: >> > ... >> >> - a way of suppressing the revisions which are just setting up >> branches >> >> (i.e. Initialized merge tracking via svnmerge). >> >> The -b switch handles this fine... or did I misunderstand you? > > Well I'm not sure what we're doing wrong then, because we > see quite a bit of it - doing 'avail' from our trunk to our live > branch at the moment, roughly 16% of the available revisions > are 'Initialized merge tracking' (we have 36 branches just now). > > I've attached a simple script which will reproduce it - it'll destroy > and create a repository and working directory in the directory it's > run from, so please don't run it from anywhere important!
Thanks for the repro recipe -- ok, it seems like the -b flag is not recognizing the "Initialized" revs as reflected (which in a strict sense they are not). However, when the actual merge is executed svnmerge.py -b does manage to do the right thing. Strange. I'll take a look at this in greater detail tonight hopefully -- I'm pretty sure its a minor bug somewhere. Cheers, Raman _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
