[Dxspider-support] IMPORTANT: WPXLOC.RAW updated 3 March 2009

[Wayne]

Hi Dirk,

Yes you are right. I did do the update by getting Jim's files. I did 
check status and it give "your branch is behind 'original/master' by 2 
commits, and can be fast-forwarded..

I then ran GIT PULL and all is fine now and up on build 38.

Thanks Dirk...

73

Wayne  WA1PMA

Dirk Koopman G1TLH wrote:
> Wayne wrote:
>> Hi All,
>> I seem to be stuck with GIT PULL...
>>
>> I did the CTY and WPXLOC updates manually and the SH/H now agrees 
>> with Jim's sh/h HK0.
>>
>> However now when trying to do GIT PULL I get:
>> error: Entry 'data/cty.dat'  not uptodate  cannot merge..
>
> I am speculating that you have downloaded a copy of cty.dat onto your 
> system from Jim's web site and possible run 
> /spider/perl/create_prefix.pl?
>
> If that is all you have done (you can check with: "git status", it 
> will tell which files have been modified). The files will be in 
> /spider/data. There will be at least 3 (probably). Then do this:-
>
> git reset --hard
>
> and then try the "git pull" again.
>
> If you have any doubts after the git status, post the output on here 
> and I will look at it and advise further.
>
> Dirk
>
> _______________________________________________
> Dxspider-support mailing list
> Dxspider-support at dxcluster.org
> http://mailman.tobit.co.uk/mailman/listinfo/dxspider-support
>