Just move everything to GitHub:

https://github.com/blog/966-improved-subversion-client-support

-brandin

On Feb 15, 2017, at 06:32, ros-dev-request@reactos.org wrote:

Send Ros-dev mailing list submissions to
   ros-dev@reactos.org

To subscribe or unsubscribe via the World Wide Web, visit
   http://www.reactos.org/mailman/listinfo/ros-dev
or, via email, send a message with subject or body 'help' to
   ros-dev-request@reactos.org

You can reach the person managing the list at
   ros-dev-owner@reactos.org

When replying, please edit your Subject line so it is more specific
than "Re: Contents of Ros-dev digest..."


Today's Topics:

  1. Re: Microsoft switched to Git (Ged Murphy)
  2. Re: Microsoft switched to Git (David Quintana (gigaherz))
  3. Re: Microsoft switched to Git (Colin Finck)
  4. Re: Microsoft switched to Git (David Quintana (gigaherz))
  5. Re: Microsoft switched to Git (Colin Finck)


----------------------------------------------------------------------

Message: 1
Date: Wed, 15 Feb 2017 11:04:52 -0000
From: "Ged Murphy" <gedmurphy.maillists@gmail.com>
To: "'ReactOS Development List'" <ros-dev@reactos.org>
Subject: Re: [ros-dev] Microsoft switched to Git
Message-ID: <004701d2877b$55983010$00c89030$@gmail.com>
Content-Type: text/plain;    charset="utf-8"

I think the easiest path is to switch to a centralized style model using git.
That is, we have a master copy (aka trunk) that gives the feel of our existing model. That would allow devs that prefer SVN to mostly continue working as before, and give the devs who want to use git in a more traditional way the ability to branch off and work in a git style manner, then sync their changes back into 'trunk'.


-----Original Message-----
From: Ros-dev [mailto:ros-dev-bounces@reactos.org] On Behalf Of Colin Finck
Sent: 15 February 2017 10:53
To: ros-dev@reactos.org
Subject: Re: [ros-dev] Microsoft switched to Git

Am 15.02.2017 um 11:35 schrieb David Quintana (gigaherz):
The number doesn't matter. The ReactOS project can't afford to lost
any long-time members. Git would be a benefit for all of us, but it
has to be a benefit for ALL of us.

Let's not forget:

- Part of the reasons developers had against Git may have been resolved by now.
- Part of the problem may be that "Git is so different" to some devs, but I think this can be resolved by a detailed Wiki article showing how to do the same thing in SVN and Git. We already wrote such articles for TortoiseSVN after all!
- And finally, we first need a plan for a Git move that doesn't suck. We tried SubGit and it failed for us. Then there is the "Merge workflow", which is supported very well by all tools, but creates a lot of parallel history. The "Rebase workflow" is more like what SVN does (keeping a linear history), but no idea how to enforce that with TortoiseGit.

I think if a team could look after these things and help moving each and every developer towards Git, it may even be doable for us.

Cheers,

Colin

_______________________________________________
Ros-dev mailing list
Ros-dev@reactos.org
http://www.reactos.org/mailman/listinfo/ros-dev




------------------------------

Message: 2
Date: Wed, 15 Feb 2017 12:18:40 +0100
From: "David Quintana (gigaherz)" <gigaherz@gmail.com>
To: ReactOS Development List <ros-dev@reactos.org>
Subject: Re: [ros-dev] Microsoft switched to Git
Message-ID:
   <CADD3+ruo18pQos1QO+jCHg5V2-hyrrjSZ7Va1pfgm+tprDbDZw@mail.gmail.com>
Content-Type: text/plain; charset="utf-8"

My belief is that the best path would be:

Phase 0: This is how we are now. We have SVN master (trunk), and a
read-only git mirror, and a semi-updated github mirror for when a
contributor really wants to submit git PRs.

Phase 1: Switch to using Git with PRs for submitting patches (Github's PR
system is really really nice these days, but other solutions exist). Setup
a SVN mirror "bot" that creates one svn commit for each push/merge detected
in the master branch, and allows the buildbots to continue working as they
do now.

This would allow the existing svn-patch workflow to continue working, but
commits on svn wouldn't be allowed anymore. Developers are expected to at
least TRY to learn to use git (it's not that hard! I promise!).

Phase 2: We switch the buildbots and testbots to pull from git, enable
testbot access for git PRs (such as with a github bot that responds to
"@rosbot runtest" or similar). The SVN mirror remains, for archival
purposes, but git commits aren't merged so regularly. Release tags/branches
can still be published through SVN, for ease of access.

Phase 3: Everyone ends up agreeing that maintaining the svn mirror is no
longer worth the effort.

Of course, anything like this will only happen if the entire team agrees to
it.

On 15 February 2017 at 12:04, Ged Murphy <gedmurphy.maillists@gmail.com>
wrote:

I think the easiest path is to switch to a centralized style model using
git.
That is, we have a master copy (aka trunk) that gives the feel of our
existing model. That would allow devs that prefer SVN to mostly continue
working as before, and give the devs who want to use git in a more
traditional way the ability to branch off and work in a git style manner,
then sync their changes back into 'trunk'.


-----Original Message-----
From: Ros-dev [mailto:ros-dev-bounces@reactos.org] On Behalf Of Colin
Finck
Sent: 15 February 2017 10:53
To: ros-dev@reactos.org
Subject: Re: [ros-dev] Microsoft switched to Git

Am 15.02.2017 um 11:35 schrieb David Quintana (gigaherz):
The number doesn't matter. The ReactOS project can't afford to lost
any long-time members. Git would be a benefit for all of us, but it
has to be a benefit for ALL of us.

Let's not forget:

- Part of the reasons developers had against Git may have been resolved by
now.
- Part of the problem may be that "Git is so different" to some devs, but
I think this can be resolved by a detailed Wiki article showing how to do
the same thing in SVN and Git. We already wrote such articles for
TortoiseSVN after all!
- And finally, we first need a plan for a Git move that doesn't suck. We
tried SubGit and it failed for us. Then there is the "Merge workflow",
which is supported very well by all tools, but creates a lot of parallel
history. The "Rebase workflow" is more like what SVN does (keeping a linear
history), but no idea how to enforce that with TortoiseGit.

I think if a team could look after these things and help moving each and
every developer towards Git, it may even be doable for us.

Cheers,

Colin

_______________________________________________
Ros-dev mailing list
Ros-dev@reactos.org
http://www.reactos.org/mailman/listinfo/ros-dev


_______________________________________________
Ros-dev mailing list
Ros-dev@reactos.org
http://www.reactos.org/mailman/listinfo/ros-dev

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.reactos.org/pipermail/ros-dev/attachments/20170215/2821855b/attachment-0001.html>

------------------------------

Message: 3
Date: Wed, 15 Feb 2017 12:28:29 +0100
From: Colin Finck <colin@reactos.org>
To: ros-dev@reactos.org
Subject: Re: [ros-dev] Microsoft switched to Git
Message-ID: <5afd77a9-f9ae-1787-2985-1f56f50e5d51@reactos.org>
Content-Type: text/plain; charset=utf-8

Am 15.02.2017 um 12:04 schrieb Ged Murphy:
That would allow devs that prefer SVN to mostly continue working as before, and give the devs who want to use git in a more traditional way the ability to branch off and work in a git style manner, then sync their changes back into 'trunk'.

Question is how is this "sync" going to happen?
When multiple developers work on Git "trunk" at the same time without
pulling before every commit, parallel history will be generated, which
is later merged automatically. This soon looks messy in Git history and
makes it hard to follow the chronologic stream of commits.

A strict rebase-only no-merge workflow would guarantee linear history
like before, but breaks many of the cool Git features. We may not even
be able to make use of GitHub Pull Requests..

Our situation is not really comparable to projects like Linux or WINE,
because they only have a single person sitting at the "trunk" to commit
patches, so parallel history cannot happen.


- Colin



------------------------------

Message: 4
Date: Wed, 15 Feb 2017 12:30:58 +0100
From: "David Quintana (gigaherz)" <gigaherz@gmail.com>
To: ReactOS Development List <ros-dev@reactos.org>
Subject: Re: [ros-dev] Microsoft switched to Git
Message-ID:
   <CADD3+rusV+3P9otVhcRPMj5XwJ6YoZL1BJiSQ8fuffTRfHbx_Q@mail.gmail.com>
Content-Type: text/plain; charset="utf-8"

Github now has a "merge as a single commit" feature included in it.

On 15 February 2017 at 12:28, Colin Finck <colin@reactos.org> wrote:

Am 15.02.2017 um 12:04 schrieb Ged Murphy:
That would allow devs that prefer SVN to mostly continue working as
before, and give the devs who want to use git in a more traditional way the
ability to branch off and work in a git style manner, then sync their
changes back into 'trunk'.

Question is how is this "sync" going to happen?
When multiple developers work on Git "trunk" at the same time without
pulling before every commit, parallel history will be generated, which
is later merged automatically. This soon looks messy in Git history and
makes it hard to follow the chronologic stream of commits.

A strict rebase-only no-merge workflow would guarantee linear history
like before, but breaks many of the cool Git features. We may not even
be able to make use of GitHub Pull Requests..

Our situation is not really comparable to projects like Linux or WINE,
because they only have a single person sitting at the "trunk" to commit
patches, so parallel history cannot happen.


- Colin

_______________________________________________
Ros-dev mailing list
Ros-dev@reactos.org
http://www.reactos.org/mailman/listinfo/ros-dev

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.reactos.org/pipermail/ros-dev/attachments/20170215/b635180a/attachment-0001.html>

------------------------------

Message: 5
Date: Wed, 15 Feb 2017 12:32:29 +0100
From: Colin Finck <colin@reactos.org>
To: ros-dev@reactos.org
Subject: Re: [ros-dev] Microsoft switched to Git
Message-ID: <9e10bc65-0c02-6934-27c3-fca6f2f82a89@reactos.org>
Content-Type: text/plain; charset=utf-8

Am 15.02.2017 um 12:18 schrieb David Quintana (gigaherz):
Setup a SVN mirror "bot" that creates one svn commit for each push/merge
detected in the master branch, and allows the buildbots to continue
working as they do now.

Let's not have a Git repository with a parallel SVN mirror again. SubGit
tried to accomplish this as a professional solution and it failed for us.

There is no reason to take extra care of the Buildslaves at all.
The same infra people, who would do the switch to Git, could also change
the Buildslaves to use Git instead of SVN in the course of that.


- Colin



------------------------------

Subject: Digest Footer

_______________________________________________
Ros-dev mailing list
Ros-dev@reactos.org
http://www.reactos.org/mailman/listinfo/ros-dev

------------------------------

End of Ros-dev Digest, Vol 150, Issue 12
****************************************