1,507
edits
Difference between revisions of "GIT Migration"
Added info on the Mercurial client
m (Wikify) |
(Added info on the Mercurial client) |
||
| Line 5: | Line 5: | ||
:Windows users may want to take a look at http://code.google.com/p/gitextensions/ and http://code.google.com/p/tortoisegit/ --[[User:Fingolfin|Fingolfin]] 12:47, 2 November 2010 (UTC) | :Windows users may want to take a look at http://code.google.com/p/gitextensions/ and http://code.google.com/p/tortoisegit/ --[[User:Fingolfin|Fingolfin]] 12:47, 2 November 2010 (UTC) | ||
=== Things to tweak in the repository conversion === | ==== Things to tweak in the repository conversion ==== | ||
:Author names/emails: see this thread: http://sourceforge.net/mailarchive/message.php?msg_name=20100807142903.71414e9c%40annie . | :Author names/emails: see this thread: http://sourceforge.net/mailarchive/message.php?msg_name=20100807142903.71414e9c%40annie . | ||
| Line 21: | Line 21: | ||
:From Fingolfin: http://sourceforge.net/mailarchive/message.php?msg_name=AA4D038A-B948-43F0-87D7-22A2818BA3ED%40quendi.de | :From Fingolfin: http://sourceforge.net/mailarchive/message.php?msg_name=AA4D038A-B948-43F0-87D7-22A2818BA3ED%40quendi.de | ||
=== Where to host the GIT repository? === | ==== Where to host the GIT repository? ==== | ||
* SF.Net Internal GIT hosting? - Not ideal. Features lacking. | * SF.Net Internal GIT hosting? - Not ideal. Features lacking. | ||
| Line 27: | Line 27: | ||
* From Fingolfin: One thing to settle is where to host the master repository: I for once would like using github, due to the many nice features it offers, like very easy code review. (FYI, I registered a scummvm project account there some time ago, in case we want to use it, and to prevent others from (ab)using it). [http://github.com/scummvm ScummVM on GITHub]. | * From Fingolfin: One thing to settle is where to host the master repository: I for once would like using github, due to the many nice features it offers, like very easy code review. (FYI, I registered a scummvm project account there some time ago, in case we want to use it, and to prevent others from (ab)using it). [http://github.com/scummvm ScummVM on GITHub]. | ||
Some of our devs already use github for their own ScummVM trees, and since github makes it super-easy for anybody to branch from another user's tree, and then push changes back (resp. file a "pull request)", this seems ideal to me. | Some of our devs already use github for their own ScummVM trees, and since github makes it super-easy for anybody to branch from another user's tree, and then push changes back (resp. file a "pull request)", this seems ideal to me. | ||
==== Alternatives ==== | |||
* The mercurial client, which is written in Python, can perhaps provide a better user experience for Windows, together with tortoise-hg. Relevant guides can be found here: | |||
http://kb.wowace.com/repositories/tortoise-hg-as-a-git-client/ | |||
http://kb.wowace.com/repositories/tortoise-hg-as-an-svn-client/ | |||