Hi Joe, Bill is probably be best authority on this but, what you posted below looks correct to me (at least on my local svn repo, that's how it works) and should post r4532 thru 4544 from wsjtx-1.4 into wsjtx development branch, assuming wsjtx is one level above.
If you've not done so, you probably need to do a commit in the wsjtx devel branch after the merge, with a comment or something stating the changes were merged from the wsjtx-1.4 rc branch. 73's Greg, KI7MT On 10/20/2014 01:20 PM, Joe Taylor wrote: >> And then a final question, so that I do this right. I have parallel >> working directories for .../branches/wsjtx and .../branches/wsjtx-1.4. >> Will the following commands do the desired merge? >> >> > cd wsjtx >> > svn merge -r4532:4544 ../wsjtx-1.4 . > Sorry to be stupid about this. I think the correct steps I should take > to merge my changes (from r4533 to r4544) into .../branches/wsjtx-1.4 > are these: > > > cd wsjtx-1.4 > > svn up > > svn merge -r4532:4544 ../wsjtx . > > Do I have it right, now? > > -- Joe > > ------------------------------------------------------------------------------ > Comprehensive Server Monitoring with Site24x7. > Monitor 10 servers for $9/Month. > Get alerted through email, SMS, voice calls or mobile push notifications. > Take corrective actions from your mobile device. > http://p.sf.net/sfu/Zoho > _______________________________________________ > wsjt-devel mailing list > wsjt-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/wsjt-devel ------------------------------------------------------------------------------ Comprehensive Server Monitoring with Site24x7. Monitor 10 servers for $9/Month. Get alerted through email, SMS, voice calls or mobile push notifications. Take corrective actions from your mobile device. http://p.sf.net/sfu/Zoho _______________________________________________ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel
