Beta Test / Technical

[nohal]

Hakan...
Don't run away, it is not as hard as it looks when you first read the following text

• Pull the latest upstream
• Create a new branch from the current upstream master (in your case it probably is not called "opencpngithub")

git checkout opencpngithub/master -B buddy

• Cherry pick the commit into it

git cherry-pick 8169db0300ed55d0853a7aac2037e11837a54954

• Replace the tabs with spaces to be consistent with the rest of the codebase, please
• Commit the changes and stash the 2 commits together to be one (You may read my masterpiece about this at Squashing commits in a git feature branch into a single commit in master - deepHill Communications)

git commit -a -m "WIP"
git rebase -i opencpngithub/master

• Push the new branch to github (in your case your github repo is probably not called "hakangithub")

git push hakangithub buddy

• Go to github and create the PR from the buddy branch to master

Pavel

[Hakan]

Pavel..
Many thanks. Clear and detailed as usual.
>> Tabs -- Sorry, forgot to check that in my new VS2013.
One Q so far:
My local repository, master, is ahead of OpenCPN master for several reasons:
- A bunch of "Langstrings" and changes to "version.h" created during build.
- A couple of my in-tree plugins.
These will be included in my new branch and want to follow the pull request to O-Master? -- A problem?
Håkan

[nohal]

Originally Posted by Hakan

Pavel..
Many thanks. Clear and detailed as usual.
>> Tabs -- Sorry, forgot to check that in my new VS2013.
One Q so far:
My local repository, master, is ahead of OpenCPN master for several reasons:
- A bunch of "Langstrings" and changes to "version.h" created during build.
- A couple of my in-tree plugins.
These will be included in my new branch and want to follow the pull request to O-Master? -- A problem?
Håkan

Hakan...
Exactly to prevent this problem you create the "buddy" branch from the upstream master, not from your local one. If you created it from your local master, the resulting PR would be the same as if you create it from your master (which is what we are trying to avoid here).

Pavel

[Hakan]

Ok - Read every word and understand it! (My English and Git terminology - that's a nice combination)

Very good - Thanks
Håkan

[Hakan]

Pavel .. may be English or ---

C:\Builds\OCPN\OpenCPN>git checkout https://github.com/OpenCPN/OpenCPN.git master -B Buddy
fatal: Cannot update paths and switch to branch 'Buddy' at the same time.

???
Håkan

[nohal]

Hakan...
I suppose you have the upstream repository already linked to your local one under some name ("git remote -v" will give you the list)
the right command then is

git checkout REMOTE_NAME/BRANCH -B NEW_LOCAL_BRANCH

(note there is no URL but the remote alias and the slash, not space)

[Hakan]

Pavel..
As simple as..
But still a possible trouble to come, my plugins:

C:\Builds\OCPN\OpenCPN>git checkout origin/master -B Buddy
warning: unable to rmdir plugins/BR24radar_pi: Directory not empty
warning: unable to rmdir plugins/launcher_pi: Directory not empty
Branch Buddy set up to track remote branch master from origin.
Switched to a new branch 'Buddy'

Anyhow, after cherry-pick -- nice command!

C:\Builds\OCPN\OpenCPN>git status
On branch Buddy
Your branch is ahead of 'origin/master' by 3 commits.
  (use "git push" to publish your local commits)
Untracked files:
  (use "git add <file>..." to include in what will be committed)

        plugins/BR24radar_pi/
        plugins/launcher_pi/

nothing added to commit but untracked files present (use "git add" to track)

Now to the "pack all to one commit will come." Nice training
Håkan

[Hakan]

Pavel..
Plugins was not a problem - all solved.

Rick...
You may want to add this lesson to your development tips collection?

Håkan

[Hakan]

Originally Posted by rgleason

Hakan,
Did you see Tracker FS#1884 by any chance? - You've just done one of the three items!
FS#1884 : AIS Remember List "White" List - Fleet, Disable Alarm, Proximity Alarm

Rick..
No, I haven't seen that before. That request is a bit more sophisticated than a new option in MMSI properties. But it works for me sailing close to a friend and still want to use the Alert for other boats when on open waters. I've to trust he's not falling in sleep while I am.
Håkan

[rgleason]

Hakan - I like what you did w buddy. Will add pavels lesson and try to follow it for understanding. Thanks pavel.

[CarCode]

Another thing with AIS data are the nonsense items for tracks for Basic and AtoN stations in the AIS list. These targets are fixed and do not move. To give them a track item in the AIS list is ********.

Gerhard

[Hakan]

Gerhard..
Agree to your point.
What about creating a patch to default them No - track?
Håkan

[Hakan]

Gerhard...BTW
If I remember right you've a Mac? If so please test the new "Follower" MMSI option if possible. I haven't been able to run that OS.
Thanks
Håkan

[CarCode]

Originally Posted by Hakan

Gerhard...BTW
If I remember right you've a Mac? If so please test the new "Follower" MMSI option if possible. I haven't been able to run that OS.
Thanks
Håkan

It works OK with Mac and has compiled with no problems.

Gerhard

[Hakan]

Thanks - great!
Håkan

Originally Posted by CarCode

It works OK with Mac and has compiled with no problems.

Gerhard