Re: [mh] Any other PRs out there/Need help submitting second PR
H Plato <[email protected]> Sun, 9 Jun 2024 08:27:23 -0600
| Newsgroups | gmane.comp.misc.misterhouse.user |
|---|---|
| Message-ID | <[email protected]> |
--===============8320274644160559503== Content-Type: multipart/alternative; boundary="Apple-Mail=_16E140E0-1924-4751-9246-10E8805E3B72" --Apple-Mail=_16E140E0-1924-4751-9246-10E8805E3B72 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 Just an update on this. With Dave=E2=80=99s awesome HA_Item module and = help, I=E2=80=99ve managed to migrate my razberry, yeelight, shluter and = my venstar modules to home assistant. I still have my eto = calcuations/open sprinkler, tasmota power and nanoleaf left to do. = I=E2=80=99ve been really impressed with Dave=E2=80=99s HA_Item work, and = think this approach will allow us to leverage the logic of MH and the = device support of HA for the future. If I can get all my device=E2=80=99s moved over and some run time in the = summer, this would be a great state for a MH release. I still use festival for a local voice engine, but have found piper, = which has a lot of promise. Right now I have an old old old linux 2.4 VM = that runs an old version of festival in =E2=80=99server mode=E2=80=99, = and a wav file is picked up and played on the speakers attached to a = Delta410. If anyone has something similar and is using piper, I=E2=80=99d = be interested in hearing about it. Again, I encourage everyone to update when they have a chance so we can = also address any issues or bugs. > On Apr 1, 2024, at 8:18=E2=80=AFAM, Lieven Hollevoet <[email protected]> = wrote: >=20 > Hey Brian, >=20 > The most efficient way to do is is to checkout the master branch, = create a new branch for PR#2, apply the change for PR#2, commit it to = the branch for PR#2.=20 >=20 > If you then create a pull request for the branch you created for PR#2 = it will only contain that change and not the one for PR#1. >=20 > The reason you see both changes is because you applied the change for = PR#2 to the same branch of PR#1.=20 >=20 > Basic idea: different pull request =3D different branch on which you = apply the change. >=20 > Hope this helps, if it doesn=E2=80=99t please send me a link to the = branch you are working on and we can take a look together. >=20 > Best regards, > Lieven. >=20 >> Op 31 mrt. 2024, om 21:41 heeft [email protected] het = volgende geschreven: >>=20 >> On 3/29/24 08:22, H Plato wrote: >>> My ask is that if there are any code updates out there that folks = want to include, to put in a pull request so we can capture them. Also, = if anyone can update to master for any testing, that would be great as = well. >> Can anybody help me with GitHub? One of my pull requests is trying to = suck in irrelevant changes from another. >>=20 >> So I fixed a minor detail in the MH master branch and submitted a PR = (call it "PR#1"). Now I have code in a much different and unrelated area = that I also want to submit ("PR#2). But since PR#1 hasn't been committed = upstream yet, PR#2 is trying to also include PR#1 as part of the pull = request. PR#1 affected one file. PR#2 should affect two other files, but = is trying to include all three. How do I send H Plato a PR#2 that = doesn't include files from PR#1? >>=20 >> -Brian M >>=20 >> ________________________________________________________ >> To unsubscribe from this list, go to: = https://lists.sourceforge.net/lists/listinfo/misterhouse-users >>=20 >=20 > ________________________________________________________ > To unsubscribe from this list, go to: = https://lists.sourceforge.net/lists/listinfo/misterhouse-users >=20 --Apple-Mail=_16E140E0-1924-4751-9246-10E8805E3B72 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8 <html><head><meta http-equiv=3D"content-type" content=3D"text/html; = charset=3Dutf-8"></head><body style=3D"overflow-wrap: break-word; = -webkit-nbsp-mode: space; line-break: after-white-space;">Just an update = on this. With Dave=E2=80=99s awesome HA_Item module and help, I=E2=80=99ve= managed to migrate my razberry, yeelight, shluter and my venstar = modules to home assistant. I still have my eto calcuations/open = sprinkler, tasmota power and nanoleaf left to do. I=E2=80=99ve been = really impressed with Dave=E2=80=99s HA_Item work, and think this = approach will allow us to leverage the logic of MH and the device = support of HA for the future.<div><br></div><div>If I can get all my = device=E2=80=99s moved over and some run time in the summer, this would = be a great state for a MH release.</div><div><br></div><div>I still use = festival for a local voice engine, but have found piper, which has a lot = of promise. Right now I have an old old old linux 2.4 VM that runs an = old version of festival in =E2=80=99server mode=E2=80=99, and a wav file = is picked up and played on the speakers attached to a Delta410. If = anyone has something similar and is using piper, I=E2=80=99d be = interested in hearing about it.</div><div><br></div><div>Again, I = encourage everyone to update when they have a chance so we can also = address any issues or bugs.<br = id=3D"lineBreakAtBeginningOfMessage"><div><br><blockquote = type=3D"cite"><div>On Apr 1, 2024, at 8:18=E2=80=AFAM, Lieven Hollevoet = <[email protected]> wrote:</div><br = class=3D"Apple-interchange-newline"><div><meta http-equiv=3D"content-type"= content=3D"text/html; charset=3Dutf-8"><div style=3D"overflow-wrap: = break-word; -webkit-nbsp-mode: space; line-break: = after-white-space;">Hey Brian,<div><br></div><div>The most efficient way = to do is is to checkout the master branch, create a new branch for PR#2, = apply the change for PR#2, commit it to the branch for = PR#2. </div><div><br></div><div>If you then create a pull request = for the branch you created for PR#2 it will only contain that change and = not the one for PR#1.</div><div><br></div><div>The reason you see both = changes is because you applied the change for PR#2 to the same branch of = PR#1. </div><div><br></div><div>Basic idea: different pull request = =3D different branch on which you apply the = change.</div><div><br></div><div>Hope this helps, if it doesn=E2=80=99t = please send me a link to the branch you are working on and we can take a = look together.</div><div><br></div><div>Best = regards,</div><div> Lieven.<br><div><br><blockquote = type=3D"cite"><div>Op 31 mrt. 2024, om 21:41 heeft = [email protected] het volgende geschreven:</div><br = class=3D"Apple-interchange-newline"><div> =20 <meta http-equiv=3D"Content-Type" content=3D"text/html; = charset=3DUTF-8"> =20 <div> <div class=3D"moz-cite-prefix">On 3/29/24 08:22, H Plato wrote:<br> </div> <blockquote type=3D"cite" = cite=3D"mid:[email protected]"> <pre class=3D"moz-quote-pre" wrap=3D"">My ask is that if there are = any code updates out there that folks want to include, to put in a pull = request so we can capture them. Also, if anyone can update to master for = any testing, that would be great as well. </pre> </blockquote><p>Can anybody help me with GitHub? One of my pull = requests is trying to suck in irrelevant changes from another.<br> </p><p>So I fixed a minor detail in the MH master branch and = submitted a PR (call it "PR#1"). Now I have code in a much different and unrelated area that I also want to submit ("PR#2). But since PR#1 hasn't been committed upstream yet, PR#2 is trying to also include PR#1 as part of the pull request. PR#1 affected one file. PR#2 should affect two other files, but is trying to include all three. How do I send H Plato a PR#2 that doesn't include files from = PR#1?</p><p> &n= bsp; -Brian M<br> </p> </div> ________________________________________________________<br>To = unsubscribe from this list, go to: = https://lists.sourceforge.net/lists/listinfo/misterhouse-users<br><br></di= v></blockquote></div><br></div></div>_____________________________________= ___________________<br>To unsubscribe from this list, go to: = https://lists.sourceforge.net/lists/listinfo/misterhouse-users<br><br></di= v></blockquote></div><br></div></body></html>= --Apple-Mail=_16E140E0-1924-4751-9246-10E8805E3B72-- --===============8320274644160559503== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline --===============8320274644160559503== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline ________________________________________________________ To unsubscribe from this list, go to: https://lists.sourceforge.net/lists/listinfo/misterhouse-users --===============8320274644160559503==--