Cruisers Forum
 


Join CruisersForum Today

Reply
 
Thread Tools Rate Thread Display Modes
Old 28-10-2015, 15:17   #1621
Registered User

Join Date: Feb 2010
Location: On the go. Not in Prague.
Posts: 3,902
Re: Beta Test / Technical

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")
Code:
git checkout opencpngithub/master -B buddy
  • Cherry pick the commit into it
Code:
git cherry-pick 8169db0300ed55d0853a7aac2037e11837a54954
Code:
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")
Code:
git push hakangithub buddy
  • Go to github and create the PR from the buddy branch to master

Pavel
__________________

__________________
nohal is offline   Reply With Quote
Old 28-10-2015, 15:39   #1622
Registered User

Join Date: Nov 2012
Location: Orust Sweden
Boat: Najad 34
Posts: 1,645
Re: Beta Test / Technical

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 is offline   Reply With Quote
Old 28-10-2015, 15:43   #1623
Registered User

Join Date: Feb 2010
Location: On the go. Not in Prague.
Posts: 3,902
Re: Beta Test / Technical

Quote:
Originally Posted by Hakan View Post
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
__________________
nohal is offline   Reply With Quote
Old 28-10-2015, 15:53   #1624
Registered User

Join Date: Nov 2012
Location: Orust Sweden
Boat: Najad 34
Posts: 1,645
Re: Beta Test / Technical

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

Very good - Thanks
Håkan
__________________
Hakan is offline   Reply With Quote
Old 28-10-2015, 16:31   #1625
Registered User

Join Date: Nov 2012
Location: Orust Sweden
Boat: Najad 34
Posts: 1,645
Re: Beta Test / Technical

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
__________________
Hakan is offline   Reply With Quote
Old 28-10-2015, 16:36   #1626
Registered User

Join Date: Feb 2010
Location: On the go. Not in Prague.
Posts: 3,902
Re: Beta Test / Technical

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
Code:
git checkout REMOTE_NAME/BRANCH -B NEW_LOCAL_BRANCH
(note there is no URL but the remote alias and the slash, not space)
__________________
nohal is offline   Reply With Quote
Old 28-10-2015, 16:49   #1627
Registered User

Join Date: Nov 2012
Location: Orust Sweden
Boat: Najad 34
Posts: 1,645
Re: Beta Test / Technical

Pavel..
As simple as..
But still a possible trouble to come, my plugins:
Code:
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!
Code:
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 is offline   Reply With Quote
Old 28-10-2015, 17:14   #1628
Registered User

Join Date: Nov 2012
Location: Orust Sweden
Boat: Najad 34
Posts: 1,645
Re: Beta Test / Technical

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

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

Håkan
__________________
Hakan is offline   Reply With Quote
Old 28-10-2015, 18:09   #1629
Registered User

Join Date: Nov 2012
Location: Orust Sweden
Boat: Najad 34
Posts: 1,645
Re: Beta Test / Technical

Quote:
Originally Posted by rgleason View Post
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
__________________
Hakan is offline   Reply With Quote
Old 29-10-2015, 05:36   #1630
Registered User
 
rgleason's Avatar

Join Date: Mar 2012
Location: Boston, MA
Boat: 1981 Bristol 32 Sloop
Posts: 7,625
Re: Beta Test / Technical

Hakan - I like what you did w buddy. Will add pavels lesson and try to follow it for understanding. Thanks pavel.
__________________
rgleason is offline   Reply With Quote
Old 29-10-2015, 05:44   #1631
Registered User

Join Date: Jul 2010
Location: Monastir, Tunisia
Boat: Westerly Pentland
Posts: 1,515
Re: Beta Test / Technical

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 bullshit.

Gerhard
Attached Thumbnails
Click image for larger version

Name:	AIS-List.png
Views:	63
Size:	177.6 KB
ID:	111783  
__________________
CarCode is offline   Reply With Quote
Old 29-10-2015, 05:51   #1632
Registered User

Join Date: Nov 2012
Location: Orust Sweden
Boat: Najad 34
Posts: 1,645
Re: Beta Test / Technical

Gerhard..
Agree to your point.
What about creating a patch to default them No - track?
Håkan
__________________
Hakan is offline   Reply With Quote
Old 29-10-2015, 10:22   #1633
Registered User

Join Date: Nov 2012
Location: Orust Sweden
Boat: Najad 34
Posts: 1,645
Re: Beta Test / Technical

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
__________________
Hakan is offline   Reply With Quote
Old 29-10-2015, 11:07   #1634
Registered User

Join Date: Jul 2010
Location: Monastir, Tunisia
Boat: Westerly Pentland
Posts: 1,515
Re: Beta Test / Technical

Quote:
Originally Posted by Hakan View Post
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
__________________
CarCode is offline   Reply With Quote
Old 29-10-2015, 11:44   #1635
Registered User

Join Date: Nov 2012
Location: Orust Sweden
Boat: Najad 34
Posts: 1,645
Re: Beta Test / Technical

Thanks - great!
Håkan
Quote:
Originally Posted by CarCode View Post
It works OK with Mac and has compiled with no problems.

Gerhard
__________________

__________________
Hakan is offline   Reply With Quote
Reply

Thread Tools
Display Modes Rate This Thread
Rate This Thread:

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is On
HTML code is Off
Trackbacks are Off
Pingbacks are Off
Refbacks are Off


Similar Threads
Thread Thread Starter Forum Replies Last Post
Beta Marine Diesel michaelmrc Engines and Propulsion Systems 48 23-03-2016 14:44
Need some technical advice....antennas. Just a Tinch Marine Electronics 15 01-12-2007 16:57
Blue Sea Systems Technical Brief GordMay Electrical: Batteries, Generators & Solar 0 16-03-2007 05:16
technical difficulties witchcraft The Sailor's Confessional 1 30-05-2005 15:09
Dow Corning Technical Manual GordMay The Library 0 12-04-2005 17:25


Our Communities

Our communities encompass many different hobbies and interests, but each one is built on friendly, intelligent membership.

» More about our Communities

Automotive Communities

Our Automotive communities encompass many different makes and models. From U.S. domestics to European Saloons.

» More about our Automotive Communities

Marine Communities

Our Marine websites focus on Cruising and Sailing Vessels, including forums and the largest cruising Wiki project on the web today.

» More about our Marine Communities


Copyright 2002- Social Knowledge, LLC All Rights Reserved.

All times are GMT -7. The time now is 01:06.


Google+
Powered by vBulletin® Version 3.8.8 Beta 1
Copyright ©2000 - 2016, vBulletin Solutions, Inc.
Social Knowledge Networks
Powered by vBulletin® Version 3.8.8 Beta 1
Copyright ©2000 - 2016, vBulletin Solutions, Inc.

ShowCase vBulletin Plugins by Drive Thru Online, Inc.