Hi all!
Let me give a short update on the Git Migration:
* The data from the committer table has been converted into an identity
map for the SVN->Git conversion tool:
https://github.com/ColinFinck/reactos-git-conversion-scripts/blob/master/re…
Together with my hacked version of svn-all-fast-export
(https://github.com/ColinFinck/svn2git), this results in a really nice
and clean Git repo :)
Further changes to your names or E-Mail addresses in that committer
table won't be taken into account. Please add your GitHub usernames to
that table though!
* As you can imagine, our tree and tools need several changes to deal
with the change from SVN revision numbers to Git commit hashes.
My first patch for reporting the "Git revision" in our codebase is ready
and open for discussion:
https://github.com/ColinFinck/reactos-git-conversion-scripts/commit/0aaa6ff…
More to follow!
Cheers,
Colin
Hi all!
Let me give a public update about our Git Migration Decisions after the
last meeting:
* The migration of our SVN repository "reactos" is going to happen in
September/October.
* https://github.com/reactos/reactos will become our master repository
as we want to take advantage of GitHub's Pull Request features.
This means, all developers must register for GitHub accounts now.
* git.reactos.org will remain as a replication slave. If we ever have
severe problems with GitHub, we can switch back to a self-hosted Git in
no time.
* We will enforce a linear history in the "master" branch through
server-side GitHub settings. You may create and push as many branches as
you want and do whatever you want there, but when you want to commit the
changes back to "master", you can only do so over a "git rebase".
* BuildBot builds will get a naming scheme like:
reactos-bootcd-0.4.7-dev+344-5f3c53e2a-gcc.7z
That means 344 commits after the tag "0.4.7-dev" has been created,
with this particular commit having the short hash "5f3c53e2a".
Whenever we branch for a release like "0.4.6", we will now not just
create the branch, but also tag "master" with "0.4.7-dev" to make this
naming scheme possible.
More newsletters like this may follow when I have more information to
share or get the impression that some decisions haven't reached all
developers yet.
Best regards,
Colin
The git repository data is compressed, and takes in the order of 100 mb.
The checkout size will be somilar but the .git folder is much more compact
than the .svn folder.
On 10 Sep 2017 10:08 am, "Michael Fritscher" <michael(a)fritscher.net> wrote:
Hi,
are there estimation about the size of a git clone vs. a svn checkout? I'm
afraid that I'll need to free much space beforehand...
Best regards,
Michael Fritscher
> If you mean your local working copy: clone into a separate folder, and
> copy
> over the files. Subversion checkout is only the current commit data, while
> git clones contain ALL THE HISTORY, so you can't "migrate" anything,
> because the svn metadata doesn't contain any of the needed info. Even if
> you could somehow migrate using a tool, the tool would still have to
> perform a clone, and would just import the file status.
>
> On 6 September 2017 at 23:06, Thomas Mueller <mueller6723(a)twc.com> wrote:
>
>> from Colin Finck:
>>
>> > Let me give a public update about our Git Migration Decisions after
>> the
>> last
>> > meeting:
>>
>> > * The migration of our SVN repository "reactos" is going to happen in
>> > September/October.
>>
>> > * https://github.com/reactos/reactos will become our master repository
>> as we
>> > want to take advantage of GitHub's Pull Request features.
>> > This means, all developers must register for GitHub accounts now.
>>
>> > * git.reactos.org will remain as a replication slave. If we ever have
>> severe
>> > problems with GitHub, we can switch back to a self-hosted Git in no
>> time.
>>
>> > * We will enforce a linear history in the "master" branch through
>> server-side
>> > GitHub settings. You may create and push as many branches as you want
>> and do
>> > whatever you want there, but when you want to commit the changes back
>> to
>> > "master", you can only do so over a "git rebase".
>>
>> > * BuildBot builds will get a naming scheme like:
>>
>> > reactos-bootcd-0.4.7-dev+344-5f3c53e2a-gcc.7z
>>
>> > That means 344 commits after the tag "0.4.7-dev" has been created,
>> with this
>> > particular commit having the short hash "5f3c53e2a".
>> > Whenever we branch for a release like "0.4.6", we will now not just
>> create the
>> > branch, but also tag "master" with "0.4.7-dev" to make this naming
>> scheme
>> > possible.
>>
>>
>> > More newsletters like this may follow when I have more information to
>> share or
>> > get the impression that some decisions haven't reached all developers
>> yet.
>>
>> Is there a convenient way to migrate an svn tree to git, or would it be
>> necessary to git-clone to a separate tree?
>>
>> Will the boot CD images be in 7z (p7zip) format:
>>
>> What has kept me from trying ReactOS is not having a place to put it,
>> considering ReactOS does not successfully boot from USB.
>>
>> My hard drives are partitioned GPT.
>>
>> Tom
>>
>>
>> _______________________________________________
>> Ros-dev mailing list
>> Ros-dev(a)reactos.org
>> http://www.reactos.org/mailman/listinfo/ros-dev
>>
> _______________________________________________
> Ros-dev mailing list
> Ros-dev(a)reactos.org
> http://www.reactos.org/mailman/listinfo/ros-dev
_______________________________________________
Ros-dev mailing list
Ros-dev(a)reactos.org
http://www.reactos.org/mailman/listinfo/ros-dev
Hi all!
As you know, we have to give up our "modules" directory concept when
switching to Git, because Git doesn't support checking out an arbitrary
directory into a subdirectory of a Git clone.
Therefore, the first commit to the migrated repository will make the
"reactos" directory the new root and move "rosapps" and "rostests"
permanently into "modules". We can then introduce an environment
variable/CMake variable/something else to enable or disable building of
them on demand (suggestions are welcome!)
But what will happen to the remaining directories in /trunk, namely
"documentation", "rossubsys", and "wallpapers"?
* Commits to "documentation" never had a relation to "reactos" commits,
so nothing is lost if we put that directory into a separate repo
"documentation.git" and remove all traces to it from the history of
"reactos.git". I'd go this way if there are no objections.
* I don't get the idea of that "rossubsys" directory created in 2014..
These subsystems are all stubs, never built with modern ReactOS, and no
work has happened since "reviving" them. I would just go and remove them
again. You can always find them in our repository history.
* The "wallpapers" directory is a harder candidate.
On the one hand, we don't want to bloat our ReactOS builds by including
wallpapers in every build. Also the number of wallpapers may increase in
the future, which could bloat the "reactos.git" repo even more.
On the other hand, the wallpapers have always accompanied our release
branches, so there is a value of having them tracked next to our code.
I could put them in a separate repository "wallpapers.git" now and
remove all traces to them in the "reactos.git" repo. But then again, how
are they picked up by the build process in the future if we can't check
them out into a subdirectory of "modules"?
Another alternative is moving them to "modules/wallpapers_disabled".
Then they are not picked up by the build process until they are renamed
to "modules/wallpapers" for releases.
What are your opinions on this?
Cheers,
Colin
Hi all!
I have to do a semester project on operating systems in my university. In GSoC 2017 ideas there is problem called «Bluetooth stack». So, is this problem already solved? If not, then could anyone tell me more about it?
Sincerely,
Alexandr Tsukanov
