Git Migration Workflows - Revision history

Mudrd8mz: Reverted edits by Mudrd8mz (talk) to last revision by Skodak

2021-08-09T13:11:25Z

Reverted edits by Mudrd8mz (talk) to last revision by Petr Škoda (škoďák)

← Older revision		Revision as of 13:11, 9 August 2021
Line 53:		Line 53:
	Every branch is usually a direct descendant of the one above it. Conceptually, the feature enters at an unstable branch (usually ''next''), and graduates to master for the next release once it is considered stable enough.		Every branch is usually a direct descendant of the one above it. Conceptually, the feature enters at an unstable branch (usually ''next''), and graduates to master for the next release once it is considered stable enough.

	~~tablees~~ are committed into the oldest supported branch that require them. Then (periodically) the integration branches are merged upwards into each other.		Fixes are committed into the oldest supported branch that require them. Then (periodically) the integration branches are merged upwards into each other.

	If there is fix applied to e.g. ''master'' that is also required in ''MOODLE_xx_STABLE'' maintenance branch, it will be cherry-picked (using git cherry-pick) downwards. This will happen a few times and is nothing to worry about unless we do it very frequently.		If there is fix applied to e.g. ''master'' that is also required in ''MOODLE_xx_STABLE'' maintenance branch, it will be cherry-picked (using git cherry-pick) downwards. This will happen a few times and is nothing to worry about unless we do it very frequently.

Mudrd8mz: MDLSITE-6551

2021-08-09T13:06:05Z

MDLSITE-6551

← Older revision		Revision as of 13:06, 9 August 2021
Line 53:		Line 53:
	Every branch is usually a direct descendant of the one above it. Conceptually, the feature enters at an unstable branch (usually ''next''), and graduates to master for the next release once it is considered stable enough.		Every branch is usually a direct descendant of the one above it. Conceptually, the feature enters at an unstable branch (usually ''next''), and graduates to master for the next release once it is considered stable enough.

	~~Fixes~~ are committed into the oldest supported branch that require them. Then (periodically) the integration branches are merged upwards into each other.		tablees are committed into the oldest supported branch that require them. Then (periodically) the integration branches are merged upwards into each other.

	If there is fix applied to e.g. ''master'' that is also required in ''MOODLE_xx_STABLE'' maintenance branch, it will be cherry-picked (using git cherry-pick) downwards. This will happen a few times and is nothing to worry about unless we do it very frequently.		If there is fix applied to e.g. ''master'' that is also required in ''MOODLE_xx_STABLE'' maintenance branch, it will be cherry-picked (using git cherry-pick) downwards. This will happen a few times and is nothing to worry about unless we do it very frequently.

Skodak at 12:05, 10 November 2013

2013-11-10T12:05:11Z

@@ Line 1: / Line 1: @@
 {{Infobox Project
 |name = Decide development workflow with git
@@ Line 122: / Line 123: @@
 Snapshots of moodle.git branches are produced daily, hourly or even after every commit and we maintain these snapshots in a CVS repository. That way we offer a solution for admins who use CVS for getting Moodle sources and do not want to switch to git for some reason.

Skodak: /* Other links */

2013-11-10T12:04:36Z

Skodak at 12:43, 20 October 2010

2010-10-20T12:43:16Z

← Older revision		Revision as of 12:43, 20 October 2010
Line 129:		Line 129:
	[[Category:Git]]		[[Category:Git]]
	[[Category:Developer tools\|Git]]		[[Category:Developer tools\|Git]]
			[[Category:Git]]

Skodak: /* CVS read-only mirrors */

2010-10-20T11:27:19Z

CVS read-only mirrors

← Older revision		Revision as of 11:27, 20 October 2010
Line 122:		Line 122:

	Snapshots of moodle.git branches are produced daily, hourly or even after every commit and we maintain these snapshots in a CVS repository. That way we offer a solution for admins who use CVS for getting Moodle sources and do not want to switch to git for some reason.		Snapshots of moodle.git branches are produced daily, hourly or even after every commit and we maintain these snapshots in a CVS repository. That way we offer a solution for admins who use CVS for getting Moodle sources and do not want to switch to git for some reason.

			== Other links ==
			* [http://github.com/skodak/moodle/wiki/Moodle-git-workflow-proposal Skodak's proposal]


	[[Category:Git]]		[[Category:Git]]
	[[Category:Developer tools\|Git]]		[[Category:Developer tools\|Git]]

Skodak at 11:21, 20 October 2010

2010-10-20T11:21:41Z

← Older revision		Revision as of 11:21, 20 October 2010
Line 7:		Line 7:
	}}		}}

	Quite a number of developers are now familiar with git and are enthusiastic about the power and flexibility it brings to the development process. However, it is ~~not clear~~ how ~~workflows in the current development process will transfer if a switch~~ to git ~~is made~~.		Quite a number of developers are now familiar with git and are enthusiastic about the power and flexibility it brings to the development process. However, it was not decided yet which model exactly is going to be used for Moodle development and how are we going to migrate from CVS to git.

	Git doesn't place constraints to one model of development which is both a feature and a hindrance for people understanding how the development process takes place. A number of workflows need to be developed in order that developers can understand how git would fit into Moodle development.		Git doesn't place constraints to one model of development which is both a feature and a hindrance for people understanding how the development process takes place. A number of workflows need to be developed in order that developers can understand how git would fit into Moodle development.

Mudrd8mz: Added info about CVS read only mirror

2010-10-17T15:24:57Z

Added info about CVS read only mirror

← Older revision		Revision as of 15:24, 17 October 2010
Line 118:		Line 118:

	Every plugin should contrain README.txt or CONTRIBUTION.txt or similar file with clear instructions on how to contribute to the plugin.		Every plugin should contrain README.txt or CONTRIBUTION.txt or similar file with clear instructions on how to contribute to the plugin.

			== CVS read-only mirrors ==

			Snapshots of moodle.git branches are produced daily, hourly or even after every commit and we maintain these snapshots in a CVS repository. That way we offer a solution for admins who use CVS for getting Moodle sources and do not want to switch to git for some reason.

	[[Category:Git]]		[[Category:Git]]
	[[Category:Developer tools\|Git]]		[[Category:Developer tools\|Git]]

Mudrd8mz at 15:17, 17 October 2010

2010-10-17T15:17:27Z

Show changes

Mudrd8mz: Undoing all my recent work - it is at a separate page

2009-10-26T11:44:23Z

Undoing all my recent work - it is at a separate page

← Older revision		Revision as of 11:44, 26 October 2009
Line 1:		Line 1:
			= Workflows for Migrating to Git =

	Quite a number of developers are now familiar with git and are enthusiastic about the power and flexibility it brings to the development process. It is not clear how workflows in the current development process will transfer if a switch to git is made.		Quite a number of developers are now familiar with git and are enthusiastic about the power and flexibility it brings to the development process. It is not clear how workflows in the current development process will transfer if a switch to git is made.

Line 5:		Line 7:
	Please edit this page to add your suggested workflows or questions for a workflow to do something.		Please edit this page to add your suggested workflows or questions for a workflow to do something.

	= ~~Preparing the environment =~~		== General Model for Commiting to HEAD ==

	~~[[Image:moodle-git-cvs-servers.png\|frame]]~~

	In the examples at this page, you are expected to use the following environment. Check the diagram. At the moment, there are two source code repositories you can use: the main Moodle CVS server cvs.moodle.org and its git mirror at git.moodle.org. While the CVS contains both Moodle core code and the contributed code, the git mirrors the core code only yet (this may be changed in the near future). We also expect you have some server (called nostromo at the diagram) that you and your team members use and that you do the actual developing at the localhost machines.

	* <code>git clone</code> can be used to create a mirror of the git.moodle.org repository at your server nostromo
	* <code>git pull</code> can be used regularly to fetch and merge the upstream changes
	* <code>git cvsimport</code> can be used to create your own git mirror of a contributed code (we do not do this yet for you)
	* <code>git push</code> can be used to backup your own work and to share it with your friend before you send it upstream (and you will, right? ;-)
	* <code>git cvsexportcommit</code> can be used to send your commits for the upstream

	= General Model for Commiting to HEAD =

	'''Summary''': How do developers 'commit' to the canonical repository?		'''Summary''': How do developers 'commit' to the canonical repository?
Line 25:		Line 15:
	* Others/hybrid approaches?		* Others/hybrid approaches?

	= Commiting to STABLE branches =		== Commiting to STABLE branches ==
	'''Summary''': How do developers commit to the stable branches? How do we ensure changes have been merged into head?		'''Summary''': How do developers commit to the stable branches? How do we ensure changes have been merged into head?

	~~= Customizing a CONTRIB plugin =~~

	'''Summary''': This suggested workflow can be used by developers who are working on a customization or a fix of a contributed Moodle plugin. You want to keep the track of your local changes and eventually send some of you changes back to the upstream.

	~~== Prepare a git mirror of the CONTRIB module ==~~

	[[Category:Git]]		[[Category:Git]]
	[[Category:Developer tools\|Git]]		[[Category:Developer tools\|Git]]

← Older revision		Revision as of 12:04, 10 November 2013
Line 122:		Line 122:

	Snapshots of moodle.git branches are produced daily, hourly or even after every commit and we maintain these snapshots in a CVS repository. That way we offer a solution for admins who use CVS for getting Moodle sources and do not want to switch to git for some reason.		Snapshots of moodle.git branches are produced daily, hourly or even after every commit and we maintain these snapshots in a CVS repository. That way we offer a solution for admins who use CVS for getting Moodle sources and do not want to switch to git for some reason.

	~~== Other links ==~~
	* [http://github.com/skodak/moodle/wiki/Moodle-git-workflow-proposal Skodak's proposal]