On Sat, Dec 15, 2018 at 5:41 PM 'Trunk Tracker' trunktracker@tampabay.rr.com [op25-dev] op25-dev@yahoogroups.com wrote:
Well, if I just run "git pull" in the terminal, it gives an error message and not sure what this means:
It means you made a change to the trunking.py file in your local repo, and it git was to pull the latest version, it'd conflict with the change that you made. Assuming you don't need the change that you made, try this:
cd ~/op25/op25/gr-op25_repeater/apps/ git reset HEAD trunking.py git checkout trunking.py git pull
~iain
From: op25-dev [mailto:op25-dev-bounces@lists.osmocom.org] On Behalf Of 'Trunk Tracker' trunktracker@tampabay.rr.com [op25-dev] Sent: Saturday, December 15, 2018 7:25 PM To: op25-dev@yahoogroups.com Subject: Re: [op25-dev] How To Hold On A Talk Group
And, would you know how I go about installing the new version that lets you type in a talk group ID to hold on? If I install that version, will it overwrite or delete anything with the current version I have?
trunktracker@tampabay.rr.com
From: op25-dev [mailto:op25-dev-bounces@lists.osmocom.org] On Behalf Of 'Trunk Tracker' trunktracker@tampabay.rr.com [op25-dev] Sent: Saturday, December 15, 2018 7:21 PM To: op25-dev@yahoogroups.com Subject: Re: [op25-dev] How To Hold On A Talk Group
What's a "repo"? I use the "boatbod" version now. So if I run those commands to update it, will it overwrite the current version I have now? And will it overwrite/delete any .tsv or .sh files that I've created? If it installs to the same directory, how can I copy the config files to the "other" version?
Thanks.
trunktracker@tampabay.rr.com
From: op25-dev@yahoogroups.com [mailto:op25-dev@yahoogroups.com] Sent: Friday, December 14, 2018 10:29 PM To: op25-dev@yahoogroups.com Subject: RE: [op25-dev] How To Hold On A Talk Group
Well that depends on your viewpoint...
My codebase was derived from osmocom max branch about a year ago, so strictly speaking it is a "fork", but it's also the production version which I maintain and enhance.
If you are already using the boatbod version of op25, the simple way to pull the updates is to run a "git pull" command from anywhere inside the ~/op25 directory hierarchy. If you're on the osmocom or dseven versions, you'll probably be best off to clone a completely separate version from my repo much as if you were installing from scratch.
cd ~
git clone https://github.com/boatbod/op25 ~/op25.boatbod
cd ~/op25.boatbod
./install.sh
(Once installed you can copy your config files over from the other version)