[sldev] Problems merging new LL code with SVK source version control

[John Hurliman]

Tobias Lang wrote:
> Hello,
>  
> I make quite a lot of changes to the SL viewer and always struggle 
> applying my changes to a new LL release. After following the 
> instructions for the SVK version control
> http://wiki.secondlife.com/wiki/Source_version_control I can update 
> to a new LL code very easliy, but only if I use the same branch, like 
> 1.18.1. If LL releases a new viewer in another branch like 1.18.3 the 
> "smerge" SVK command doesn't work anymore, telling me that no common 
> merge base exists between the LL branch and my SVN repository.
>  
> Is this a common problem or am I doing s.th <http://s.th>. wrong? How 
> to you guys usually update to a new version? Merging always manually?
>  
> Thank you,
> Tobias

I can't provide any useful advice on how to use SVK, but I use patch 
files excessively. Whenever I accomplish something that might be worth 
keeping I create a patch file out of it. Then if you do something else 
noteworthy in the same files the first patch touched you can reverse 
apply the first patch, create the second patch, then reapply the first. 
When a new viewer is released apply your patchset to the new branch and 
manually inspect any conflicts to see what needs updating. If you decide 
to create a JIRA for any of it you already have patch files on hand.

John Hurliman