Git Migration Newsletter

[Colin Finck]

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

[Thomas Mueller]

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

[David Quintana (gigaherz)]

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
>

[Michael Fritscher]

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

[Colin Finck]

Am 10.09.2017 um 10:06 schrieb Michael Fritscher:
>   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... 
No estimations necessary, I can give you actual numbers :)

The SVN->Git converted repo (covering everything up to r75532) takes up 
902MB for the entire Git clone and 459MB for the .git directory.


- Colin

[Colin Finck]

Am 06.09.2017 um 11:33 schrieb Colin Finck:
>   * BuildBot builds will get a naming scheme like:
>  
>       reactos-bootcd-0.4.7-dev+344-5f3c53e2a-gcc.7z 
I have checked what a simple "git describe" actually outputs and using 
that scheme, our filenames will rather look like:

     reactos-bootcd-0.4.7-dev-344-g5f3c53e-gcc.7z

So the "+" is actually a "-" and the short hash is prepended by a
"g" 
for Git. I think instead of reinventing the wheel and postprocessing the 
"git describe" output to our original scheme, we just adopt our scheme 
to this one. Unless you have serious objections ;)

Cheers,

Colin

[David Quintana (gigaherz)]

Works for me.

On 12 September 2017 at 16:48, Colin Finck <colin(a)reactos.org> wrote:

>   Am 06.09.2017 um 11:33 schrieb Colin Finck:
>
> >   * BuildBot builds will get a naming scheme like:
> >
> >       reactos-bootcd-0.4.7-dev+344-5f3c53e2a-gcc.7z
> >  
>  I have checked what a simple "git describe" actually outputs and using
>  that scheme, our filenames will rather look like:
>
>      reactos-bootcd-0.4.7-dev-344-g5f3c53e-gcc.7z
>
>  So the "+" is actually a "-" and the short hash is prepended by a
> "g" for
>  Git. I think instead of reinventing the wheel and postprocessing the "git
>  describe" output to our original scheme, we just adopt our scheme to this
>  one. Unless you have serious objections ;)
>
>  Cheers,
>
>
>  Colin
>
>  _______________________________________________
>  Ros-dev mailing list
>  Ros-dev(a)reactos.org
>  http://www.reactos.org/mailman/listinfo/ros-dev
>