[Dxspider-support] Update went wrong

Mon Dec 13 16:42:23 GMT 2021

Hi Dirk,
I did this, was able to get a bit further, now I have a lot of merge
conflicts, should I just delete those conflicting files? :

sysop at debian-2gb-nbg1-1:~/spider$ git checkout master
Switched to branch 'master'
Your branch and 'origin/master' have diverged,
and have 359 and 83 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

sysop at debian-2gb-nbg1-1:~/spider$ git branch -D mojo
Deleted branch mojo (was d4ba5e726).

sysop at debian-2gb-nbg1-1:~/spider$ git reset --hard
HEAD is now at d4ba5e726 move isregistered to DXChannel.pm

sysop at debian-2gb-nbg1-1:~/spider$ git pull
Auto-merging perl/watchdbg
Auto-merging perl/issue.pl
Auto-merging perl/grepdbg
CONFLICT (content): Merge conflict in perl/grepdbg
Auto-merging perl/create_prefix.pl
Auto-merging perl/console.pl
CONFLICT (content): Merge conflict in perl/console.pl
Auto-merging perl/cluster.pl
CONFLICT (content): Merge conflict in perl/cluster.pl
Auto-merging perl/Version.pm
CONFLICT (content): Merge conflict in perl/Version.pm
Auto-merging perl/Spot.pm
CONFLICT (content): Merge conflict in perl/Spot.pm
Auto-merging perl/QSL.pm
CONFLICT (content): Merge conflict in perl/QSL.pm
Auto-merging perl/Messages
CONFLICT (content): Merge conflict in perl/Messages
Auto-merging perl/Filter.pm
CONFLICT (content): Merge conflict in perl/Filter.pm
Auto-merging perl/DXVars.pm.issue
Auto-merging perl/DXUtil.pm
Auto-merging perl/DXUser.pm
CONFLICT (content): Merge conflict in perl/DXUser.pm
Auto-merging perl/DXSql/SQLite.pm
Auto-merging perl/DXProtout.pm
CONFLICT (content): Merge conflict in perl/DXProtout.pm
Auto-merging perl/DXProtHandle.pm
CONFLICT (content): Merge conflict in perl/DXProtHandle.pm
Auto-merging perl/DXLog.pm
CONFLICT (content): Merge conflict in perl/DXLog.pm
Auto-merging perl/DXCron.pm
CONFLICT (content): Merge conflict in perl/DXCron.pm
Auto-merging perl/DXCommandmode.pm
CONFLICT (content): Merge conflict in perl/DXCommandmode.pm
Auto-merging perl/DXChannel.pm
CONFLICT (content): Merge conflict in perl/DXChannel.pm
Auto-merging perl/AsyncMsg.pm
CONFLICT (content): Merge conflict in perl/AsyncMsg.pm
Auto-merging data/wpxloc.raw
CONFLICT (content): Merge conflict in data/wpxloc.raw
Auto-merging data/prefix_data.pl
CONFLICT (content): Merge conflict in data/prefix_data.pl
Auto-merging data/cty.dat
CONFLICT (content): Merge conflict in data/cty.dat
Auto-merging cmd/show/version.pl
CONFLICT (content): Merge conflict in cmd/show/version.pl
Auto-merging cmd/show/registered.pl
CONFLICT (content): Merge conflict in cmd/show/registered.pl
Auto-merging cmd/show/log.pl
CONFLICT (content): Merge conflict in cmd/show/log.pl
Auto-merging cmd/show/dx.pl
CONFLICT (content): Merge conflict in cmd/show/dx.pl
Auto-merging cmd/show/425.pl
Auto-merging cmd/load/dxqsl.pl
CONFLICT (add/add): Merge conflict in cmd/load/dxqsl.pl
Auto-merging cmd/Commands_en.hlp
Auto-merging cmd/Aliases
CONFLICT (content): Merge conflict in cmd/Aliases
Auto-merging Changes
CONFLICT (content): Merge conflict in Changes
Automatic merge failed; fix conflicts and then commit the result.
sysop at debian-2gb-nbg1-1:~/spider$ git checkout --track -b mojo origin/mojo
Changes: needs merge
cmd/Aliases: needs merge
cmd/load/dxqsl.pl: needs merge
cmd/show/dx.pl: needs merge
cmd/show/log.pl: needs merge
cmd/show/registered.pl: needs merge
cmd/show/version.pl: needs merge
data/cty.dat: needs merge
data/prefix_data.pl: needs merge
data/wpxloc.raw: needs merge
perl/AsyncMsg.pm: needs merge
perl/DXChannel.pm: needs merge
perl/DXCommandmode.pm: needs merge
perl/DXCron.pm: needs merge
perl/DXLog.pm: needs merge
perl/DXProtHandle.pm: needs merge
perl/DXProtout.pm: needs merge
perl/DXUser.pm: needs merge
perl/Filter.pm: needs merge
perl/Messages: needs merge
perl/QSL.pm: needs merge
perl/Spot.pm: needs merge
perl/Version.pm: needs merge
perl/cluster.pl: needs merge
perl/console.pl: needs merge
perl/grepdbg: needs merge
error: you need to resolve your current index first

Op ma 13 dec. 2021 om 17:33 schreef Dirk Koopman via Dxspider-support <
dxspider-support at tobit.co.uk>:

> Try this:
>
> git checkout master
> git branch -D mojo
> git pull
> git checkout --track -b mojo origin/mojo
> git reset --hard
>
> On 13/12/2021 16:19, Erwin Fiten via Dxspider-support wrote:
>
> Hi Dirk, I just managed to change the branch to mojo already, so this is
> the result of these commands:
>
> sysop at debian-2gb-nbg1-1:~/spider$ git checkout mojo
> Already on 'mojo'
>
> sysop at debian-2gb-nbg1-1:~/spider$ git reset --hard
> HEAD is now at d4ba5e726 move isregistered to DXChannel.pm
>
> sysop at debian-2gb-nbg1-1:~/spider$ git pull
> There is no tracking information for the current branch.
> Please specify which branch you want to merge with.
> See git-pull(1) for details.
>
>     git pull <remote> <branch>
>
> If you wish to set tracking information for this branch you can do so with:
>
>     git branch --set-upstream-to=origin/<branch> mojo
>
> Op ma 13 dec. 2021 om 17:13 schreef Dirk Koopman via Dxspider-support <
> dxspider-support at tobit.co.uk>:
>
>> The "correct" way to update is to:
>>
>> cd /spider
>> git reset --hard
>> git pull
>>
>> That's it.
>>
>> You are correct that you have reset it back to master branch. But try
>> this:
>>
>> git checkout mojo
>> git reset --hard
>> git pull
>>
>>
>> On 13/12/2021 15:44, Erwin Fiten via Dxspider-support wrote:
>>
>> Hi,
>>
>> I was running  ver. V1.57 build 345
>> Today my VM rebooted, so i took the chance to update to the latest
>> version with the commands :
>>
>>
>>
>>
>>
>> *git clone git://scm.dxcluster.org/scm/spider
>> <http://scm.dxcluster.org/scm/spider> spider.new cp -a spider.new/.git
>> /spider rm -rf spider.new cd /spider git reset --hard*
>>
>> Somehow this went wrong because when I restarted the cluster I found it
>> running (with loads of errors) on version: V1.55 build 229
>>
>> When I check the branch, I get this :
>>
>>
>>
>> *sysop at debian:/spider/perl$ git branch * master   mojo*
>>
>> So I'm on the 'old' branch again, I think ?
>> How do I change back to Mojo & update?
>>
>>
>> *sysop at debian:/spider/perl$ git branch mojo fatal: A branch named 'mojo'
>> already exists.*
>>
>> This is not an option...
>>
>> Erwin, ON8AR
>>
>> _______________________________________________
>> Dxspider-support mailing listDxspider-support at tobit.co.ukhttps://mailman.tobit.co.uk/mailman/listinfo/dxspider-support
>>
>>
>> _______________________________________________
>> Dxspider-support mailing list
>> Dxspider-support at tobit.co.uk
>> https://mailman.tobit.co.uk/mailman/listinfo/dxspider-support
>>
>
> _______________________________________________
> Dxspider-support mailing listDxspider-support at tobit.co.ukhttps://mailman.tobit.co.uk/mailman/listinfo/dxspider-support
>
>
> _______________________________________________
> Dxspider-support mailing list
> Dxspider-support at tobit.co.uk
> https://mailman.tobit.co.uk/mailman/listinfo/dxspider-support
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mailman.tobit.co.uk/pipermail/dxspider-support/attachments/20211213/fc10cf7b/attachment-0001.htm>