> 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
