<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
<title></title>
<meta http-equiv="content-type" content="text/html;charset=utf-8"/>
<meta http-equiv="Content-Style-Type" content="text/css"/>
</head>
<body>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt">Hello all, firstly a Happy New Year to everyone - let's hope we have an interesting 2017...!</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt"><br />
</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt">My GB7DXC-5 node is hosted on a Raspberry Pi Model B+ (with Raspbian wheezy as the
O/S) and is currently running DXSpider v1.55 build 0.176. I've just tried to update the system
to the most recent version of DXSpider (v1.57?) and have encountered some problems with
'git pull' that are beyond my limited knowledge and experience of Linux to resolve so I hope
someone here can help...</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt"><br />
</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt">I'm logged in to the R-Pi as sysop and have just executed the following commands, which I
recall reading somewhere were the appropriate ones to use:</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt"><br />
</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt">cd /spider</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt">git reset --hard</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt">git pull</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt"><br />
</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt">The 'git reset --hard' command results in the following response:</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt"><br />
</span></font></div>
<div align="left"><font face="Arial" color="#0000ff" size="2"><span style=" font-size:10pt">"Unstaged changes after reset:</span></font></div>
<div align="left" style="margin-left:12mm; margin-right:0mm; text-indent:-12mm; margin-top:0.00mm; margin-bottom:0.00mm;"><font face="Arial" color="#0000ff" size="2">
<span style=" font-size:10pt">M data/cty.dat</span></font></div>
<div align="left" style="margin-left:12mm; margin-right:0mm; text-indent:-12mm; margin-top:0.00mm; margin-bottom:0.00mm;"><font face="Arial" color="#0000ff" size="2">
<span style=" font-size:10pt">M data/prefix_data.pl</span></font></div>
<div align="left" style="margin-left:12mm; margin-right:0mm; text-indent:-12mm; margin-top:0.00mm; margin-bottom:0.00mm;"><font face="Arial" color="#0000ff" size="2">
<span style=" font-size:10pt">M data/wpxloc.raw"</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt"><br />
</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt">Then, when I execute the 'git pull' command I get the following response:</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt"><br />
</span></font></div>
<div align="left"><font face="Arial" color="#0000ff" size="2"><span style=" font-size:10pt">"error: Your local changes to the following files would be overwritten by merge"</span></font></div>
<div align="left"><font face="Arial" color="#0000ff" size="2"><span style=" font-size:10pt"> data/cty.dat</span></font></div>
<div align="left"><font face="Arial" color="#0000ff" size="2"><span style=" font-size:10pt"> data/prefix_data.pl</span></font></div>
<div align="left"><font face="Arial" color="#0000ff" size="2"><span style=" font-size:10pt"> data/wpxloc.raw</span></font></div>
<div align="left"><font face="Arial" color="#0000ff" size="2"><span style=" font-size:10pt"><br />
</span></font></div>
<div align="left"><font face="Arial" color="#0000ff" size="2"><span style=" font-size:10pt">Please, commit your changes or stash them before you can merge.</span></font></div>
<div align="left"><font face="Arial" color="#0000ff" size="2"><span style=" font-size:10pt">Aborting"</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt"><br />
</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt">I assume that all of this happens because the versions of cty.dat, prefix_data.pl and
wpxloc.raw on my system are more recent than the versions that 'git pull' is trying to put onto
the system - I updated cty.dat etc a few days ago in response to the announcement about
CTY-2615 from Jim AD1C on 31st December.</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt"><br />
</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt">I got round the 'Aborting' problem by deleting the three aforementioned files from my system,
after which the 'git pull' appeared to work correctly so I then updated the cty.dat and
wpxloc.raw files again, and generated the updated prefix_data.pl file, in the usual manner.</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt"><br />
</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt">It seems to me that I need either to have the 'git pull' overwrite the existing files (after which
they'd need to be updated again) or ignore the three files and do the merge anyway - is there
a 'git pull' option for achieving this? Perhaps someone who's more versed in using 'git pull'
than me can offer some suggestions.</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt"><br />
</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt">More interestingly, after I'd successfully done the 'git pull' (and rebooted the system for good
measure) I found that the version of DXSpider running on the system was still v1.55 but it's
now build 0.185 instead of the previous 0.176. I see that several of the nodes here in the UK
are running v1.57; why hasn't the 'git pull' updated my system to that version (and is there a
need for me to move to it)?</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt"><br />
</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt">Many thanks in advance,</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt"><br />
</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt">--</span></font></div>
<div align="left"><font face="Arial" size="2"><span style=" font-size:10pt">73, Martin G0HDB</span></font></div>
<div align="left"> </div>
<br /><br />
<hr style='border:none; color:#909090; background-color:#B0B0B0; height: 1px; width: 99%;' />
<table style='border-collapse:collapse;border:none;'>
<tr>
<td style='border:none;padding:0px 15px 0px 8px'>
<a href="https://www.avast.com/antivirus">
<img border=0 src="http://static.avast.com/emails/avast-mail-stamp.png" alt="Avast logo" />
</a>
</td>
<td>
<p style='color:#3d4d5a; font-family:"Calibri","Verdana","Arial","Helvetica"; font-size:12pt;'>
This email has been checked for viruses by Avast antivirus software.
<br><a href="https://www.avast.com/antivirus">www.avast.com</a>
</p>
</td>
</tr>
</table>
<br />
</body>
</html>