<html>
<head>
<meta content="text/html; charset=windows-1252"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<div class="moz-cite-prefix">Martin<br>
<br>
I am slightly surprised by what happened using the standard git
update procedure.<br>
<br>
The 'git reset --hard' should have removed (erm... "blown away")
any changes that you might have made to, for instance, cty.dat
etc...<br>
<br>
This certainly happens when I am using it. <br>
<br>
The message that you describe suggests that you might have done
the 'git reset' without the '--hard'.<br>
<br>
Please repeat your update, making sure that the '--hard' is added
and please report any problems. It is safe to do. You should also
find that the latest cty.dat is included, so you won't have to
update it manually this time.<br>
<br>
On the subject of 1.57. This is an "experimental" version that is,
in fact, part of the git version that you pull. It can only be
used with the correct git incantation. But it is a fiddle to
install correctly and doesn't really give you anything you want -
unless you have significant numbers (probably more than 50,
certainly more than 100) of users and are running out of CPU
resources servicing them. But there does seem to be a problem,
which may be perl version related, about doing a clean install of
the 'mojo' branch (as 1.57 is known), although I am working on
both aspects of this. Also, once done, it isn't easily changed
back to 1.55 - this will change too in due course. <br>
<br>
The spur for the new 'mojo' branch was, in fact, the dumping of
DXSpider for something purpose written by the RBN Project, where
DXSpider could not keep up with the volume of spots being sent to
the then 100's of users. Since then the RBN spot feed has become
more distributed and that problem seems to have largely subsided
anyway. But I am interested, generally, in the possibilities of
the software becoming better able to handle more traffic and also
presenting it in different forms. None this will affect the
"normal" node and - unless you are <u><b>really</b></u>
interested in sort of thing - you should avoid 1.57 for the time
being. But I am hoping that, sometime this year (assuming we all
still exist) I will be presenting DXSpider 2, probably manifesting
as 1.58. <br>
<br>
Dirk<br>
<br>
On 09/01/17 12:07, Martin Davies G0HDB via Dxspider-support wrote:<br>
</div>
<blockquote cite="mid:58737D16.31384.BEB915@marting0hdb.gmail.com"
type="cite">
<title></title>
<meta http-equiv="content-type" content="text/html;
charset=windows-1252">
<meta http-equiv="Content-Style-Type" content="text/css">
<div align="left"><font size="2" face="Arial"><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 size="2" face="Arial"><span style="
font-size:10pt"><br>
</span></font></div>
<div align="left"><font size="2" face="Arial"><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 size="2" face="Arial"><span style="
font-size:10pt"><br>
</span></font></div>
<div align="left"><font size="2" face="Arial"><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 size="2" face="Arial"><span style="
font-size:10pt"><br>
</span></font></div>
<div align="left"><font size="2" face="Arial"><span style="
font-size:10pt">cd /spider</span></font></div>
<div align="left"><font size="2" face="Arial"><span style="
font-size:10pt">git reset --hard</span></font></div>
<div align="left"><font size="2" face="Arial"><span style="
font-size:10pt">git pull</span></font></div>
<div align="left"><font size="2" face="Arial"><span style="
font-size:10pt"><br>
</span></font></div>
<div align="left"><font size="2" face="Arial"><span style="
font-size:10pt">The 'git reset --hard' command results in
the following response:</span></font></div>
<div align="left"><font size="2" face="Arial"><span style="
font-size:10pt"><br>
</span></font></div>
<div align="left"><font size="2" face="Arial" color="#0000ff"><span
style=" font-size:10pt">"Unstaged changes after reset:</span></font></div>
<div style="margin-left:12mm; margin-right:0mm; text-indent:-12mm;
margin-top:0.00mm; margin-bottom:0.00mm;" align="left"><font
size="2" face="Arial" color="#0000ff">
<span style=" font-size:10pt">M data/cty.dat</span></font></div>
<div style="margin-left:12mm; margin-right:0mm; text-indent:-12mm;
margin-top:0.00mm; margin-bottom:0.00mm;" align="left"><font
size="2" face="Arial" color="#0000ff">
<span style=" font-size:10pt">M data/prefix_data.pl</span></font></div>
<div style="margin-left:12mm; margin-right:0mm; text-indent:-12mm;
margin-top:0.00mm; margin-bottom:0.00mm;" align="left"><font
size="2" face="Arial" color="#0000ff">
<span style=" font-size:10pt">M data/wpxloc.raw"</span></font></div>
<div align="left"><font size="2" face="Arial"><span style="
font-size:10pt"><br>
</span></font></div>
<div align="left"><font size="2" face="Arial"><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 size="2" face="Arial"><span style="
font-size:10pt"><br>
</span></font></div>
<div align="left"><font size="2" face="Arial" color="#0000ff"><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 size="2" face="Arial" color="#0000ff"><span
style=" font-size:10pt"> data/cty.dat</span></font></div>
<div align="left"><font size="2" face="Arial" color="#0000ff"><span
style=" font-size:10pt"> data/prefix_data.pl</span></font></div>
<div align="left"><font size="2" face="Arial" color="#0000ff"><span
style=" font-size:10pt"> data/wpxloc.raw</span></font></div>
<div align="left"><font size="2" face="Arial" color="#0000ff"><span
style=" font-size:10pt"><br>
</span></font></div>
<div align="left"><font size="2" face="Arial" color="#0000ff"><span
style=" font-size:10pt">Please, commit your changes or stash
them before you can merge.</span></font></div>
<div align="left"><font size="2" face="Arial" color="#0000ff"><span
style=" font-size:10pt">Aborting"</span></font></div>
<div align="left"><font size="2" face="Arial"><span style="
font-size:10pt"><br>
</span></font></div>
<div align="left"><font size="2" face="Arial"><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 size="2" face="Arial"><span style="
font-size:10pt"><br>
</span></font></div>
<div align="left"><font size="2" face="Arial"><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 size="2" face="Arial"><span style="
font-size:10pt"><br>
</span></font></div>
<div align="left"><font size="2" face="Arial"><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 size="2" face="Arial"><span style="
font-size:10pt"><br>
</span></font></div>
<div align="left"><font size="2" face="Arial"><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 size="2" face="Arial"><span style="
font-size:10pt"><br>
</span></font></div>
<div align="left"><font size="2" face="Arial"><span style="
font-size:10pt">Many thanks in advance,</span></font></div>
<div align="left"><font size="2" face="Arial"><span style="
font-size:10pt"><br>
</span></font></div>
<div align="left"><font size="2" face="Arial"><span style="
font-size:10pt">--</span></font></div>
<div align="left"><font size="2" face="Arial"><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;">
<tbody>
<tr>
<td style="border:none;padding:0px 15px 0px 8px"> <a
moz-do-not-send="true"
href="https://www.avast.com/antivirus"> <img
moz-do-not-send="true"
src="http://static.avast.com/emails/avast-mail-stamp.png"
alt="Avast logo" border="0"> </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 moz-do-not-send="true"
href="https://www.avast.com/antivirus">www.avast.com</a>
</p>
</td>
</tr>
</tbody>
</table>
<br>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
Dxspider-support mailing list
<a class="moz-txt-link-abbreviated" href="mailto:Dxspider-support@dxcluster.org">Dxspider-support@dxcluster.org</a>
<a class="moz-txt-link-freetext" href="http://mailman.tobit.co.uk/mailman/listinfo/dxspider-support">http://mailman.tobit.co.uk/mailman/listinfo/dxspider-support</a>
</pre>
</blockquote>
<br>
</body>
</html>