[Dxspider-support] Update went wrong

[Dirk Koopman]

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 <mailto: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 list
>>     Dxspider-support at tobit.co.uk  <mailto:Dxspider-support at tobit.co.uk>
>>     https://mailman.tobit.co.uk/mailman/listinfo/dxspider-support  <https://mailman.tobit.co.uk/mailman/listinfo/dxspider-support>
>
>     _______________________________________________
>     Dxspider-support mailing list
>     Dxspider-support at tobit.co.uk <mailto:Dxspider-support at tobit.co.uk>
>     https://mailman.tobit.co.uk/mailman/listinfo/dxspider-support
>     <https://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/a1d104ab/attachment.htm>