On Dec 21, 2006, at 10:00 PM, Blair Zajac wrote: > > On Dec 18, 2006, at 1:00 PM, Larry Streepy wrote: > >> I couldn't find a "search" function for the email archive, so I >> browsed >> several months of messages and didn't find anything relevant to >> this, so I >> decided to post it. I'm sorry if this has been discussed in the >> past. >> >> I've been studying svnmerge.py and getting a handle on it and it >> seems to >> support a model where "trunk" changes are merged into a branch with >> ease >> (no requirement for the user to determine which revisions are >> included in >> the init command). However, the reverse (merging from the branch >> back to >> the truck) seems to require additional work by the user. >> >> I'd like to propose a change, and I'm sure I'll be quickly told if >> I'm in >> the weeds :-) >> >> I've got a patch (probably not optimal with my current knowledge >> level of >> the code), that better supports the 'init' command when the current >> directory is the trunk and the "source" being specified is a branch >> off of >> the trunk (or current working directory). So, assume that the >> current >> working directory is a checkout of the HEAD revision of the trunk. >> >> Currently, the documentation says I need to use a command like this >> to init >> the trunk: >> >> svnmerge.py init -r1-XXX <url-to-branch> >> >> It would seem to me that a simple check to see if the <url-to- >> branch> is a >> branch of the current working directory would allow one to >> determine the -r >> settings automatically. >> >> Here's a simple patch that accomplishes that. I'd like to get some >> feedback on the approach, and if I've missed some big picture >> thingy that >> makes this impractical/wrong in any way. >> >> Thanks, >> Larry. > > Hi Larry, > > I ended up using this today and it worked out pretty well. I'll > look at committing this soon. > > Regards, > Blair
I committed this into trunk at r22788. Thanks Larry. Regards, Blair _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
