Hello!
I would like to inject more life into our branches and hence need to remove as much dead bodies from that area as possible. And I need your feedback!
Please comment on that list. like - needs to be merged, useless, could be deleted.
aicom-hardware-fun "Branch for my hardware support work and other stuff". Last commit 17th of May, 2010. Bring back Cromwell as a temporary USB stack until mjmartin finishes the new one, Implement missing storage stack drivers (storport, ataport, etc), Work more on the PnP manager. Obsolete?
aicom-network-branch Last commit was 4th of August, 2011. Another branch for networking fixes. "If someone wants to delete aicom-network-fixes, they are welcome to"
alex-network-branch Last commit was 24th of December, 2006. Some parts are still not merged. What a shame!
arty-newcc New CC implementation by arty. It stays.
arty-stable Arty - do you need it? No problem in keeping it, if you need it.
arwinss Aleksey - do you need it? Yes I do!! :-)
audio-bringup Johannes? Last commit 26 of April, 2011.
c++-bringup Very promising name and just one commit by jgardou, 8th of March, 2012. Jerome?
cmake-bringup I think we switched to CMake already. Any reason to keep this branch?
dib_rewrite Timo's great work.
GSoC_2011 Five subbranches. What's their status? Were they all merged?
icu4ros-bringup Empty branch. Amine, would you comment whether it's necessary?
iut-mmc Pierre?
jcatena-branch MSVC work. Needed?
kd++ By Hermes. I think, it's needed.
lean-explorer Lean explorer by Martin Fuchs. Last touched in 2006.
nocc Special "nocc" cache manager. It stays.
nslookup I guess lsuggs gave up on that. But the idea was nice.
ntvdm We all know [TheFlash]. Stable progress. Good work.
nyadav-audio-branch Last commit dates to year 2011. Nyadav?
olpc One awesome Laptop Per one awesome Child. We can keep it a bit more for historical reasons.
pierre-fsd Pierre's presumably great work.
reactx GreatLord's work on DirectX. Status unknown. Sylvain?
ros-amd64-bringup Timo - is it still relevant, or did you already merge it in trunk?
ros-csrss Last commit says "Ready for merging (TM) :)". ORLY? :-)
shell32_new-bringup Mr. Mihail, you around? Anyone knows state of that work?
sspi-bringup Samuel? What's with that branch?
tcp-rewrite-branch LWIP. I think it's integrated into trunk long time ago? Last commit - year 2010
the-real-msvc KJK's work which stopped in 2008. Anyone could comment whether there is anything we haven't achieved with CMake yet?
Tree-restructure-test Playground for restructuring the tree. "Let's reshuflle the files and directories and that makes our OS more stable and usable". Last commit was almost exactly 3 years ago.
usb-bringup-trunk Johannes? Still need that?
vs_jc jjones? Do you plan to continue working on that?
wlan-bringup Cameron, how's it going?
Hi Aleksey,
I very much agree with keeping it clean. I moved my vs_jc branch to a different server, so please feel free to kill it at ReactOS.
Best Regards,
-JC
-----Original Message----- From: ros-dev-bounces@reactos.org [mailto:ros-dev-bounces@reactos.org] On Behalf Of Aleksey Bragin Sent: Monday, October 07, 2013 4:03 PM To: ReactOS Development List Subject: [ros-dev] Branches status & cleanup
Hello!
I would like to inject more life into our branches and hence need to remove as much dead bodies from that area as possible. And I need your feedback!
Please comment on that list. like - needs to be merged, useless, could be deleted.
aicom-hardware-fun "Branch for my hardware support work and other stuff". Last commit 17th of May, 2010. Bring back Cromwell as a temporary USB stack until mjmartin finishes the new one, Implement missing storage stack drivers (storport, ataport, etc), Work more on the PnP manager. Obsolete?
aicom-network-branch Last commit was 4th of August, 2011. Another branch for networking fixes. "If someone wants to delete aicom-network-fixes, they are welcome to"
alex-network-branch Last commit was 24th of December, 2006. Some parts are still not merged. What a shame!
arty-newcc New CC implementation by arty. It stays.
arty-stable Arty - do you need it? No problem in keeping it, if you need it.
arwinss Aleksey - do you need it? Yes I do!! :-)
audio-bringup Johannes? Last commit 26 of April, 2011.
c++-bringup Very promising name and just one commit by jgardou, 8th of March, 2012. Jerome?
cmake-bringup I think we switched to CMake already. Any reason to keep this branch?
dib_rewrite Timo's great work.
GSoC_2011 Five subbranches. What's their status? Were they all merged?
icu4ros-bringup Empty branch. Amine, would you comment whether it's necessary?
iut-mmc Pierre?
jcatena-branch MSVC work. Needed?
kd++ By Hermes. I think, it's needed.
lean-explorer Lean explorer by Martin Fuchs. Last touched in 2006.
nocc Special "nocc" cache manager. It stays.
nslookup I guess lsuggs gave up on that. But the idea was nice.
ntvdm We all know [TheFlash]. Stable progress. Good work.
nyadav-audio-branch Last commit dates to year 2011. Nyadav?
olpc One awesome Laptop Per one awesome Child. We can keep it a bit more for historical reasons.
pierre-fsd Pierre's presumably great work.
reactx GreatLord's work on DirectX. Status unknown. Sylvain?
ros-amd64-bringup Timo - is it still relevant, or did you already merge it in trunk?
ros-csrss Last commit says "Ready for merging (TM) :)". ORLY? :-)
shell32_new-bringup Mr. Mihail, you around? Anyone knows state of that work?
sspi-bringup Samuel? What's with that branch?
tcp-rewrite-branch LWIP. I think it's integrated into trunk long time ago? Last commit - year 2010
the-real-msvc KJK's work which stopped in 2008. Anyone could comment whether there is anything we haven't achieved with CMake yet?
Tree-restructure-test Playground for restructuring the tree. "Let's reshuflle the files and directories and that makes our OS more stable and usable". Last commit was almost exactly 3 years ago.
usb-bringup-trunk Johannes? Still need that?
vs_jc jjones? Do you plan to continue working on that?
wlan-bringup Cameron, how's it going?
_______________________________________________ Ros-dev mailing list Ros-dev@reactos.org http://www.reactos.org/mailman/listinfo/ros-dev
----- No virus found in this message. Checked by AVG - www.avg.com Version: 2013.0.3408 / Virus Database: 3222/6728 - Release Date: 10/06/13
On 10/07/2013 11:03 PM, Aleksey Bragin wrote:
Hello!
I would like to inject more life into our branches and hence need to remove as much dead bodies from that area as possible. And I need your feedback!
Please comment on that list. like - needs to be merged, useless, could be deleted.
aicom-hardware-fun "Branch for my hardware support work and other stuff". Last commit 17th of May, 2010. Bring back Cromwell as a temporary USB stack until mjmartin finishes the new one, Implement missing storage stack drivers (storport, ataport, etc), Work more on the PnP manager. Obsolete?
aicom-network-branch Last commit was 4th of August, 2011. Another branch for networking fixes. "If someone wants to delete aicom-network-fixes, they are welcome to"
alex-network-branch Last commit was 24th of December, 2006. Some parts are still not merged. What a shame!
arty-newcc New CC implementation by arty. It stays.
arty-stable Arty - do you need it? No problem in keeping it, if you need it.
arwinss Aleksey - do you need it? Yes I do!! :-)
I would have put that one as first candidate for deletion :-).
audio-bringup Johannes? Last commit 26 of April, 2011.
c++-bringup Very promising name and just one commit by jgardou, 8th of March, 2012. Jerome?
cmake-bringup I think we switched to CMake already. Any reason to keep this branch?
dib_rewrite Timo's great work.
GSoC_2011 Five subbranches. What's their status? Were they all merged?
icu4ros-bringup Empty branch. Amine, would you comment whether it's necessary?
iut-mmc Pierre?
So far, don't touch, I'll delete when needed.
jcatena-branch MSVC work. Needed?
kd++ By Hermes. I think, it's needed.
lean-explorer Lean explorer by Martin Fuchs. Last touched in 2006.
nocc Special "nocc" cache manager. It stays.
nslookup I guess lsuggs gave up on that. But the idea was nice.
ntvdm We all know [TheFlash]. Stable progress. Good work.
nyadav-audio-branch Last commit dates to year 2011. Nyadav?
olpc One awesome Laptop Per one awesome Child. We can keep it a bit more for historical reasons.
pierre-fsd Pierre's presumably great work.
AFAIK, IIRC, this has been merged in arty-newcc and some parts even to trunk. So, I'd say, candidate for deletion.
reactx GreatLord's work on DirectX. Status unknown. Sylvain?
ros-amd64-bringup Timo - is it still relevant, or did you already merge it in trunk?
ros-csrss Last commit says "Ready for merging (TM) :)". ORLY? :-)
shell32_new-bringup Mr. Mihail, you around? Anyone knows state of that work?
sspi-bringup Samuel? What's with that branch?
tcp-rewrite-branch LWIP. I think it's integrated into trunk long time ago? Last commit - year 2010
the-real-msvc KJK's work which stopped in 2008. Anyone could comment whether there is anything we haven't achieved with CMake yet?
Tree-restructure-test Playground for restructuring the tree. "Let's reshuflle the files and directories and that makes our OS more stable and usable". Last commit was almost exactly 3 years ago.
usb-bringup-trunk Johannes? Still need that?
vs_jc jjones? Do you plan to continue working on that?
wlan-bringup Cameron, how's it going?
Ros-dev mailing list Ros-dev@reactos.org http://www.reactos.org/mailman/listinfo/ros-dev
On 08.10.2013 11:29, Pierre Schweitzer wrote:
pierre-fsd Pierre's presumably great work. AFAIK, IIRC, this has been merged in arty-newcc and some parts even to trunk. So, I'd say, candidate for deletion.
Could you actually check? It's your work, so it should be simpler for you to see whether it's merged or not.
Regards, Aleksey
I will answer for my branches :
kd++ By Hermes. I think, it's needed.
Keep it, because it's here that I intend to experiment with kdbg (used primarily in gcc builds) and with windbg.
ros-csrss Last commit says "Ready for merging (TM) :)". ORLY? :-)
Keep it for reference still one year, maybe ? After it can go away (yet there are some interesting URLs in some commits messages).
---------- Now global questions / remarks :
arwinss Aleksey - do you need it? Yes I do!! :-)
We all think so ; some time ago (when I merged ros-csrss) I promised to try to fix the console thing in arwinss too; it's obvious that most of the work is in the win32csr --> winsrv / basesrv / csrsrv switch, and taking into account some add-ins done by you Aleksey, and also with the recent work on adding functionality to basesrv and winsrv to make Win2k3 core dlls runnable into ROS.
c++-bringup Very promising name and just one commit by jgardou, 8th of March, 2012.
We can already compile c++ things with GCC / MSVC now, iirc.
nslookup I guess lsuggs gave up on that. But the idea was nice. olpc One awesome Laptop Per one awesome Child. We can keep it a bit more for
historical reasons.
What was their purpose ? (just to know)
Tree-restructure-test Playground for restructuring the tree. "Let's reshuflle the files and
directories and that makes our OS more stable and usable". Last commit was almost exactly 3 years ago.
I'm personally very interested in this thing (cf. http://www.reactos.org/forum/viewtopic.php?p=102258&sid=ef8d6c9a27f9e380... ff87afdc5919 and OF COURSE http://www.reactos.org/wiki/Techwiki:File_Layout ) which aims at bringing modularity.
Cheers, Hermès.
-----Message d'origine----- De : ros-dev-bounces@reactos.org [mailto:ros-dev-bounces@reactos.org] De la part de Aleksey Bragin Envoyé : lundi 7 octobre 2013 23:03 À : ReactOS Development List Objet : [ros-dev] Branches status & cleanup
Hello!
I would like to inject more life into our branches and hence need to remove as much dead bodies from that area as possible. And I need your feedback!
Please comment on that list. like - needs to be merged, useless, could be deleted.
aicom-hardware-fun "Branch for my hardware support work and other stuff". Last commit 17th of May, 2010. Bring back Cromwell as a temporary USB stack until mjmartin finishes the new one, Implement missing storage stack drivers (storport, ataport, etc), Work more on the PnP manager. Obsolete?
aicom-network-branch Last commit was 4th of August, 2011. Another branch for networking fixes. "If someone wants to delete aicom-network-fixes, they are welcome to"
alex-network-branch Last commit was 24th of December, 2006. Some parts are still not merged. What a shame!
arty-newcc New CC implementation by arty. It stays.
arty-stable Arty - do you need it? No problem in keeping it, if you need it.
arwinss Aleksey - do you need it? Yes I do!! :-)
audio-bringup Johannes? Last commit 26 of April, 2011.
c++-bringup Very promising name and just one commit by jgardou, 8th of March, 2012. Jerome?
cmake-bringup I think we switched to CMake already. Any reason to keep this branch?
dib_rewrite Timo's great work.
GSoC_2011 Five subbranches. What's their status? Were they all merged?
icu4ros-bringup Empty branch. Amine, would you comment whether it's necessary?
iut-mmc Pierre?
jcatena-branch MSVC work. Needed?
kd++ By Hermes. I think, it's needed.
lean-explorer Lean explorer by Martin Fuchs. Last touched in 2006.
nocc Special "nocc" cache manager. It stays.
nslookup I guess lsuggs gave up on that. But the idea was nice.
ntvdm We all know [TheFlash]. Stable progress. Good work.
nyadav-audio-branch Last commit dates to year 2011. Nyadav?
olpc One awesome Laptop Per one awesome Child. We can keep it a bit more for historical reasons.
pierre-fsd Pierre's presumably great work.
reactx GreatLord's work on DirectX. Status unknown. Sylvain?
ros-amd64-bringup Timo - is it still relevant, or did you already merge it in trunk?
ros-csrss Last commit says "Ready for merging (TM) :)". ORLY? :-)
shell32_new-bringup Mr. Mihail, you around? Anyone knows state of that work?
sspi-bringup Samuel? What's with that branch?
tcp-rewrite-branch LWIP. I think it's integrated into trunk long time ago? Last commit - year 2010
the-real-msvc KJK's work which stopped in 2008. Anyone could comment whether there is anything we haven't achieved with CMake yet?
Tree-restructure-test Playground for restructuring the tree. "Let's reshuflle the files and directories and that makes our OS more stable and usable". Last commit was almost exactly 3 years ago.
usb-bringup-trunk Johannes? Still need that?
vs_jc jjones? Do you plan to continue working on that?
wlan-bringup Cameron, how's it going?
_______________________________________________ Ros-dev mailing list Ros-dev@reactos.org http://www.reactos.org/mailman/listinfo/ros-dev
Yes! This is such an obvious improvement, I'm surprised it's still not widely accepted.
An epic mail from Timo explaining the current tree layout https://www.reactos.org/archives/public/ros-dev/2010-July/013278.html
For anyone still interested in reading our rants, here's the start of the original mailing list convo https://www.reactos.org/archives/public/ros-dev/2010-July/013257.html
-----Original Message----- From: ros-dev-bounces@reactos.org [mailto:ros-dev-bounces@reactos.org] On Behalf Of Hermès BÉLUSCA - MAÏTO Sent: 08 October 2013 17:47 To: 'ReactOS Development List' Subject: Re: [ros-dev] Branches status & cleanup
Tree-restructure-test Playground for restructuring the tree. "Let's reshuflle the files and
directories and that makes our OS more stable and usable". Last commit was almost exactly 3 years ago.
I'm personally very interested in this thing (cf. http://www.reactos.org/forum/viewtopic.php?p=102258&sid=ef8d6c9a27f9e380... ff87afdc5919 and OF COURSE http://www.reactos.org/wiki/Techwiki:File_Layout ) which aims at bringing modularity.
Cheers, Hermès.
On 08.10.2013 20:47, Hermès BÉLUSCA - MAÏTO wrote:
ros-csrss Last commit says "Ready for merging (TM) :)". ORLY? :-)
Keep it for reference still one year, maybe ? After it can go away (yet there are some interesting URLs in some commits messages).
SVN keeps it infinitely as long as we backup the repository properly. However, I prefer to svn copy/svn move files, or reintegrate the branch into trunk so that the history is not lost. If it's lost in your case, it really sucks. Maybe you would need to add some comment to the csrss code files specifying the branch name and revisions when it existed.
Now global questions / remarks :
arwinss Aleksey - do you need it? Yes I do!! :-)
We all think so ; some time ago (when I merged ros-csrss) I promised to try to fix the console thing in arwinss too; it's obvious that most of the work is in the win32csr --> winsrv / basesrv / csrsrv switch, and taking into account some add-ins done by you Aleksey, and also with the recent work on adding functionality to basesrv and winsrv to make Win2k3 core dlls runnable into ROS.
Thank you, would be cool.
c++-bringup Very promising name and just one commit by jgardou, 8th of March, 2012.
We can already compile c++ things with GCC / MSVC now, iirc.
So, candidate for deletion?
nslookup I guess lsuggs gave up on that. But the idea was nice. olpc One awesome Laptop Per one awesome Child. We can keep it a bit more for
historical reasons.
What was their purpose ? (just to know)
Purpose of what?
Tree-restructure-test Playground for restructuring the tree. "Let's reshuflle the files and
directories and that makes our OS more stable and usable". Last commit was almost exactly 3 years ago.
I'm personally very interested in this thing (cf. http://www.reactos.org/forum/viewtopic.php?p=102258&sid=ef8d6c9a27f9e380... ff87afdc5919 and OF COURSE http://www.reactos.org/wiki/Techwiki:File_Layout ) which aims at bringing modularity.
Yes, it's fun, but I will spoil it saying that there are more important things to do first :-)
Regards, Aleksey
Answer to Aleksey :
ros-csrss Last commit says "Ready for merging (TM) :)". ORLY? :-)
Keep it for reference still one year, maybe ? After it can go away (yet there are some interesting URLs in some commits messages).
SVN keeps it infinitely as long as we backup the repository properly. However, I prefer to svn copy/svn move files, or reintegrate the branch
into trunk so that the history is not lost. If it's lost in your case, it really sucks. Maybe you would need to add some comment to the csrss code files specifying the branch name and revisions when it existed.
Well since it's merged (revision 58770) and you say that the history won't be lost, then you can sweep the branch out.
c++-bringup Very promising name and just one commit by jgardou, 8th of March, 2012.
We can already compile c++ things with GCC / MSVC now, iirc.
So, candidate for deletion?
We should ask Amine and Thomas and Timo :)
nslookup I guess lsuggs gave up on that. But the idea was nice. olpc One awesome Laptop Per one awesome Child. We can keep it a bit more for
historical reasons.
What was their purpose ? (just to know)
Purpose of what?
Of those branches ofc !!
Tree-restructure-test
Yes, it's fun, but I will spoil it saying that there are more important
things to do first :-)
Lol xD
Cheers, Hermès
On 2013-10-09 02:41, Hermès BÉLUSCA - MAÏTO wrote:
c++-bringup Very promising name and just one commit by jgardou, 8th of March, 2012.
We can already compile c++ things with GCC / MSVC now, iirc.
So, candidate for deletion?
We should ask Amine and Thomas and Timo :)
It's already deleted ;) But yes, it's no longer needed.
On 2013-10-07 23:03, Aleksey Bragin wrote:
GSoC_2011 Five subbranches. What's their status? Were they all merged?
- Claudiu's and mine are fully merged. - According to SVN I took the explorer_new fixes from Andrew's into trunk last year ... I'll recheck whether that was everything. - Timo's is unmerged and has some unmet dependencies IIRC. - Giannis merged most or all of his, but he should know best if there's anything useful in there still.
On 2013-10-07 23:03, Aleksey Bragin wrote:
nyadav-audio-branch Last commit dates to year 2011. Nyadav?
This is the sixth GSoC branch, Neeraj's. I believe it was concluded it didn't contain anything that needs to be merged, but not sure... Johannes?
Am 09.10.2013 10:18, schrieb Thomas Faber:
On 2013-10-07 23:03, Aleksey Bragin wrote:
GSoC_2011 Five subbranches. What's their status? Were they all merged?
- Claudiu's and mine are fully merged.
- According to SVN I took the explorer_new fixes from Andrew's into trunk last year ... I'll recheck whether that was everything.
- Timo's is unmerged and has some unmet dependencies IIRC.
- Giannis merged most or all of his, but he should know best if there's anything useful in there still.
Please keep my GSoC branch, it contains code for the font engine rewrite, which is still WIP and I plan to continue on it after the DIB rewrite branch is finished. (And after I fixed PSEH3, implemented PSEH for C++ and CLANG, fixed a dozen Jira issues, rewrote Mm and Cc and found a cure for cancer.)
Tip: order your priorities !!
-----Message d'origine----- De : ros-dev-bounces@reactos.org [mailto:ros-dev-bounces@reactos.org] De la part de Timo Kreuzer Envoyé : mercredi 9 octobre 2013 11:08 À : ReactOS Development List Objet : Re: [ros-dev] Branches status & cleanup
Am 09.10.2013 10:18, schrieb Thomas Faber:
On 2013-10-07 23:03, Aleksey Bragin wrote:
GSoC_2011 Five subbranches. What's their status? Were they all merged?
- Claudiu's and mine are fully merged.
- According to SVN I took the explorer_new fixes from Andrew's into trunk last year ... I'll recheck whether that was everything.
- Timo's is unmerged and has some unmet dependencies IIRC.
- Giannis merged most or all of his, but he should know best if there's anything useful in there still.
Please keep my GSoC branch, it contains code for the font engine rewrite, which is still WIP and I plan to continue on it after the DIB rewrite branch is finished. (And after I fixed PSEH3, implemented PSEH for C++ and CLANG, fixed a dozen Jira issues, rewrote Mm and Cc and found a cure for cancer.)
_______________________________________________ Ros-dev mailing list Ros-dev@reactos.org http://www.reactos.org/mailman/listinfo/ros-dev
If he starts from the latter, then he would have more than enough money to fund all ReactOS development and buy Microsoft Corp. :D
Regards, Aleksey
On 09.10.2013 16:55, Hermès BÉLUSCA - MAÏTO wrote:
Tip: order your priorities !!
-----Message d'origine----- De : ros-dev-bounces@reactos.org [mailto:ros-dev-bounces@reactos.org] De la part de Timo Kreuzer Envoyé : mercredi 9 octobre 2013 11:08 À : ReactOS Development List Objet : Re: [ros-dev] Branches status & cleanup
Am 09.10.2013 10:18, schrieb Thomas Faber:
On 2013-10-07 23:03, Aleksey Bragin wrote:
GSoC_2011 Five subbranches. What's their status? Were they all merged?
- Claudiu's and mine are fully merged.
- According to SVN I took the explorer_new fixes from Andrew's into trunk last year ... I'll recheck whether that was everything.
- Timo's is unmerged and has some unmet dependencies IIRC.
- Giannis merged most or all of his, but he should know best if there's anything useful in there still.
Please keep my GSoC branch, it contains code for the font engine rewrite, which is still WIP and I plan to continue on it after the DIB rewrite branch is finished. (And after I fixed PSEH3, implemented PSEH for C++ and CLANG, fixed a dozen Jira issues, rewrote Mm and Cc and found a cure for cancer.)