Many thanks, Bill -- your reply has exactly the help I needed.
-- Joe
On 10/20/2014 5:58 PM, Bill Somerville wrote:
> On 20/10/2014 20:20, Joe Taylor wrote:
>
> Hi Joe,
>>> 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?
> No that includes changes other than yours which will cause issues.
>
> First think to note is that the way svn merge works is that the changes
> are applied to the current working directory but the source of the
> changes is the repository. So you only need a checkout of the
> destination branch to do a merge. It doesn't matter that you have
> another working directory, it just isn't relevant here.
>
> I tend to use the '-c' switch to select the changsets I wish to merge,
> that takes individual changeset numbers and IMHO is clearer than the
> '-r' version so long as the list of changesets to merge is not too long.
> So first I would list the changesets in the source branch to confirm I
> have the correct ones e.g.
>
> svn log -c4533,4534,4535,4536,4537,4540,4544 ^/branches/wsjtx
>
> This command is standalone as it references the repository only.
>
> Once you are happy that you have the correct changesets, you can then do
> the merge in a destination branch workspace. So in your workspace that
> has the wsjtx-1.4 branch checkout:
>
> svn merge -c4533,4534,4535,4536,4537,4540,4544 ^/branches/wsjtx
>
> Note that this is conveniently the same as the log command above with
> 'merge' substituted for 'log'. That will update your workspace with the
> results of the merge. Then resolve any conflicts, note that conflicts
> are possible even if you have no local edits. Then compile and test and
> once you are happy that nothing is broken, commit the changes.
>>
>> -- Joe
> 73
> Bill
> G4WJS.
>
> ------------------------------------------------------------------------------
> 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
> [email protected]
> 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
[email protected]
https://lists.sourceforge.net/lists/listinfo/wsjt-devel
