Gary Thomas wrote: > I'm trying to use svnmerge to keep track of my various branches. > What I have is one parent and multiple child/derived branches > from that parent branch. If I set up svnmerge for one child > branch only then all is well. Once I add a second child, it > can no longer figure out any merge infomation :-( > > I checked out svnmerge.py directly from the subversion tree > on/about Jan 22, 2006. > -rwxr-xr-x 1 gthomas wheel 72648 Jan 22 03:55 /home/gthomas/bin/svnmerge.py > > Attached is a little script I wrote that demonstrates the > problem I'm seeing. I'm sorry if this is a well known problem, > I've read what I could find on the web - I couldn't locate > archives for this mailing list.
I figured this out - the "help" page for avail is a little misleading. I was missing the fact that you need to specify "-S <SOURCE>" when there are multiple choices which sort of contradicts the help line. Anyway, I now understand. Sorry for the noise. -- ------------------------------------------------------------ Gary Thomas | Consulting for the MLB Associates | Embedded world ------------------------------------------------------------ _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
