Edited by littlesat, 18 April 2021 - 08:54.
merge requests for PLi's git
Started by Persian Prince, 16 Apr 2013 12:12
1748 replies to this topic
Re: merge requests for PLi's git #1561
-
- PLi® Core member
- 57,171 posts
+698
Excellent
Posted 18 April 2021 - 08:51
I’m saying working more together is better then working separately in different forks. E.g. regarding the integrated multi epg... agree something and get it integrated there where you did fork from.... (use a fork for development and push it back)... the point is that you have forks due to miss agreement. At the and indeed the users can choose but do they really benefit? (Devs need work twice on same stuff, images do not have all features so you need to swap for features,!less flash room due to multiboot - lol).
WaveFrontier 28.2E | 23.5E | 19.2E | 16E | 13E | 10/9E | 7E | 5E | 1W | 4/5W | 15W
Re: merge requests for PLi's git #1562
-
- PLi® Core member
- 57,171 posts
+698
Excellent
Posted 18 April 2021 - 08:55
@pp
You’re currently pushing so match stuff that it might be better to start a pp-merge request thread
You’re currently pushing so match stuff that it might be better to start a pp-merge request thread
WaveFrontier 28.2E | 23.5E | 19.2E | 16E | 13E | 10/9E | 7E | 5E | 1W | 4/5W | 15W
Re: merge requests for PLi's git #1563
-
- Senior Member
- 1,982 posts
+247
Excellent
Posted 18 April 2021 - 12:30
@pp
You’re currently pushing so match stuff that it might be better to start a pp-merge request thread
This is my thread 
You missed https://github.com/O...gimport/pull/52 I think.
Open Vision sources: https://github.com/OpenVisionE2
Re: merge requests for PLi's git #1564
-
- PLi® Core member
- 57,171 posts
+698
Excellent
Posted 18 April 2021 - 13:35
Indeed it is your thread .....
WaveFrontier 28.2E | 23.5E | 19.2E | 16E | 13E | 10/9E | 7E | 5E | 1W | 4/5W | 15W
Re: merge requests for PLi's git #1565
-
- PLi® Core member
- 57,171 posts
+698
Excellent
Posted 18 April 2021 - 13:37
WaveFrontier 28.2E | 23.5E | 19.2E | 16E | 13E | 10/9E | 7E | 5E | 1W | 4/5W | 15W
Re: merge requests for PLi's git #1566
-
- PLi® Core member
- 70,528 posts
+1,811
Excellent
Posted 18 April 2021 - 13:49
That "merged" label refers to PR 2921 in the Enigma2 repo...
Currently in use: VU+ Duo 4K (2xFBC S2), VU+ Solo 4K (1xFBC S2), uClan Usytm 4K Ultimate (S2+T2), Octagon SF8008 (S2+T2), Zgemma H9.2H (S2+T2)
Due to my bad health, I will not be very active at times and may be slow to respond. I will not read the forum or PM on a regular basis.
Many answers to your question can be found in our new and improved wiki.
Re: merge requests for PLi's git #1567
-
- PLi® Core member
- 57,171 posts
+698
Excellent
Posted 18 April 2021 - 15:06
Kan you do it?
WaveFrontier 28.2E | 23.5E | 19.2E | 16E | 13E | 10/9E | 7E | 5E | 1W | 4/5W | 15W
Re: merge requests for PLi's git #1568
-
- Senior Member
- 1,982 posts
+247
Excellent
Posted 18 April 2021 - 17:00
Kan you do it?
Nobody can when there's a conflict unless someone fix it.
The way you merge PRs is wrong as you need to check PR numbers first.
You need to go with older PR first, now take a look at what happened, because of one file a PR with more than 40 files is ruined and I need to send it again 
Open Vision sources: https://github.com/OpenVisionE2
Re: merge requests for PLi's git #1569
-
- PLi® Core member
- 57,171 posts
+698
Excellent
Posted 18 April 2021 - 17:12
Sorry!
WaveFrontier 28.2E | 23.5E | 19.2E | 16E | 13E | 10/9E | 7E | 5E | 1W | 4/5W | 15W
Re: merge requests for PLi's git #1570
-
- Senior Member
- 1,982 posts
+247
Excellent
Re: merge requests for PLi's git #1571
-
- PLi® Core member
- 70,528 posts
+1,811
Excellent
Posted 19 April 2021 - 10:29
Merged
Currently in use: VU+ Duo 4K (2xFBC S2), VU+ Solo 4K (1xFBC S2), uClan Usytm 4K Ultimate (S2+T2), Octagon SF8008 (S2+T2), Zgemma H9.2H (S2+T2)
Due to my bad health, I will not be very active at times and may be slow to respond. I will not read the forum or PM on a regular basis.
Many answers to your question can be found in our new and improved wiki.
Re: merge requests for PLi's git #1572
-
- PLi® Core member
- 57,171 posts
+698
Excellent
Posted 19 April 2021 - 16:34
Thanks!
WaveFrontier 28.2E | 23.5E | 19.2E | 16E | 13E | 10/9E | 7E | 5E | 1W | 4/5W | 15W
Re: merge requests for PLi's git #1573
-
- Senior Member
- 1,982 posts
+247
Excellent
Posted 30 April 2021 - 06:32
https://github.com/O...igma2/pull/2941 (1 week old PR)
https://github.com/O...igma2/pull/2962 (cherry-pick jbleyel commit from ATV, currently available in OV)
Open Vision sources: https://github.com/OpenVisionE2
Re: merge requests for PLi's git #1574
-
- PLi® Core member
- 10,328 posts
+350
Excellent
Posted 30 April 2021 - 06:40
Plese delete this line
https://github.com/O...e9294eb0a105dR4
or
echo "PEP8 double aggressive safe cleanup"
Edited by Dimitrij, 30 April 2021 - 06:41.
GigaBlue UHD Quad 4K /Lunix3-4K/Duo 4K
Re: merge requests for PLi's git #1575
-
- Senior Member
- 1,982 posts
+247
Excellent
Posted 30 April 2021 - 07:07
Plese delete this line
https://github.com/O...e9294eb0a105dR4
or
echo "PEP8 double aggressive safe cleanup"
That's a message and won't be in commit logs, see Open WebIF and you'll understand my script won't add any names to the commits: https://github.com/E.../commits/master
This tool won't be running by users remember it.
Edited by Persian Prince, 30 April 2021 - 07:07.
Open Vision sources: https://github.com/OpenVisionE2
Re: merge requests for PLi's git #1576
-
- PLi® Core member
- 10,328 posts
+350
Excellent
Posted 30 April 2021 - 08:04
Firstly, I don't see any problems here at all.
Why is this necessary?
Secondly, this is the decision of the openPli team.
Edited by Dimitrij, 30 April 2021 - 08:05.
GigaBlue UHD Quad 4K /Lunix3-4K/Duo 4K
Re: merge requests for PLi's git #1577
-
- PLi® Core member
- 2,345 posts
+121
Excellent
Posted 30 April 2021 - 08:06
https://github.com/O...igma2/pull/2962 (cherry-pick jbleyel commit from ATV, currently available in OV)
I think this is the wrong solution.
Relying on the fact that the source code is installed does not mean that the plugin is working properly.
I think if you need some functionality from plugin, you need to check this with a specific function import from plugin and not just with the existence of source code.
Edited by Taapat, 30 April 2021 - 08:08.
Re: merge requests for PLi's git #1578
-
- Senior Member
- 1,982 posts
+247
Excellent
Posted 30 April 2021 - 08:34
https://github.com/O...igma2/pull/2962 (cherry-pick jbleyel commit from ATV, currently available in OV)
I think this is the wrong solution.Relying on the fact that the source code is installed does not mean that the plugin is working properly.I think if you need some functionality from plugin, you need to check this with a specific function import from plugin and not just with the existence of source code.
Your idea may be better but this a replacement for https://github.com/O...tup.py#L96~L108 pyo checks that's all.
Open Vision sources: https://github.com/OpenVisionE2
Re: merge requests for PLi's git #1579
-
- PLi® Contributor
- 2,499 posts
+64
Good
Posted 17 February 2023 - 18:55
Re: merge requests for PLi's git #1580
-
- PLi® Core member
- 57,171 posts
+698
Excellent
Posted 18 February 2023 - 08:35
Done
WaveFrontier 28.2E | 23.5E | 19.2E | 16E | 13E | 10/9E | 7E | 5E | 1W | 4/5W | 15W
4 user(s) are reading this topic
0 members, 4 guests, 0 anonymous users
