Great explanation Chris, thank you, I’m sure I can work with that. > On 6 Jul 2019, at 10:20 am, Chris Morley <[email protected]> wrote: > > Here is a way to do it (from memory) - again there is always more then one > way and surely shortcuts. > It's a good time to try this in 2.8 because since it's not released yet we > can fix it without trouble :) > > Assuming the plasmac component is exactly the same in master - I would git > cherry-pick it's SHA number > Since the VCP panel is different I would commit the new version into your > 2.8. > Then you must merge your 2.8 into your master. > > git checkout 2.8 > git pull (so you know you are current) > commit and/or cherry-pick changes > gitk (check you are happy you might want to build if it's compiled code or > build docs if it's doc code) > > git checkout master > git pull (so you know you are current) > git merge 2.8 > > There will be a conflict because the VCP names are then same. > You must fix the conflicts, git add the fixed files and then git commit. > (I'll let you look up how to fix conflicts or maybe you already know) > gitk ( check you are happy) > > ok so now your 2.8 and your master are updated. > So skipping over details like the building checks etc... > > Then I would switch to 2.8 > > git checkout 2.8 > (final happy check) > git push --dry-run > git push > > git checkout master > (final happy check) > git push --dry-run > git push > > Ok now linxcnc has all your changes. > > Now say later you have changes to the plasmac component that belongs in 2.8 > and master. > you would commit the changes in 2.8 and merge them up to master. > This is where if you commit changes to a branch that you know will cause > merge conflicts, > it's nice to do the merge right away - because you will know how the code > should be. > Some times it's not possible because of someone else's complicated conflicts > that is in code you don't understand. > > if you have changes that belong just in master you commit them just to master > - keeping in mind that that can still > create merge conflicts when 2.8 is merged in next time. > > Hope that helps > > Chris M > ________________________________ > From: Phillip Carter <[email protected]> > Sent: July 5, 2019 11:30 PM > To: linuxcnc-developers > Subject: Re: [Emc-developers] 2.8 plasmac > > There are no changes to existing LinuxCNC code, it is just an additional > component, VCP additions and configurations. > > I am not sure how to proceed, currently I have locally a master branch only. > > Do I copy all plasma related stuff then create a 2.8 branch from upstream > then put the plasmac stuff in there and push to upstream 2.8. > > How do I then keep the local and upstream master and 2.8 plasmac stuff in > sync as well, it will be exactly the same code for both branches. > > This multiple branch stuff is totally new to me and I would like to get it > right. > > >> On 6 Jul 2019, at 7:12 am, Moses McKnight <[email protected]> wrote: >> >> What Chris says is right - if GUI changes are just in the form of VCP and >> configs and all, it is fine with me - and thanks for your work! >> >> Moses >> >> On 7/5/19 2:57 PM, Chris Morley wrote: >>> The release manager has last say on what can't be added. >>> Assuming your 'GUI' changes are VCP changes (not say AXIS changes) , then >>> it sounds fine to add. >>> plasmac is a stand alone component so is fine to add. >>> If you don't get a negative response from Moses soon, I think you can >>> safely assume it's ok. >>> (And since 2.8 isn't released yet we actually could back out code ) >>> Chris M >>> ________________________________ >>> From: Phillip Carter <[email protected]> >>> Sent: July 5, 2019 4:25 AM >>> To: linuxcnc-developers >>> Subject: [Emc-developers] 2.8 plasmac >>> I have tested the plasmac configurations on 2.8 and they appear to work ok >>> with the only proviso that the reverse run feature is not supported. >>> I have modified the GUIs so that none of the reverse run widgets show if >>> the LinuxCNC version is less than 2.9. >>> Is it feasible to put plasmac in 2.8? >>> If so I will then need a bit of guidance on how to do it. >>> _______________________________________________ >>> Emc-developers mailing list >>> [email protected] >>> https://lists.sourceforge.net/lists/listinfo/emc-developers >>> _______________________________________________ >>> Emc-developers mailing list >>> [email protected] >>> https://lists.sourceforge.net/lists/listinfo/emc-developers >> >> -- >> And as it is appointed unto men once to die, but after this the judgment: >> So Christ was once offered to bear the sins of many; and unto them that look >> for him shall he appear the second time without sin unto salvation. >> (Hebrews 9:27-28) >> >> >> _______________________________________________ >> Emc-developers mailing list >> [email protected] >> https://lists.sourceforge.net/lists/listinfo/emc-developers > > > > _______________________________________________ > Emc-developers mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/emc-developers > > _______________________________________________ > Emc-developers mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/emc-developers
_______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
