Mercurial - Revision history

Elifarley at 03:55, 31 March 2011

2011-03-31T03:55:42Z

← Older revision		Revision as of 03:55, 31 March 2011
Line 62:		Line 62:

	[[Category: Software]]		[[Category: Software]]
			[[Category: Crash Course]]

Elifarley at 01:10, 16 October 2010

2010-10-16T01:10:28Z

← Older revision		Revision as of 01:10, 16 October 2010
Line 6:		Line 6:
	==Basic Concepts==		==Basic Concepts==
	* '''Working copy''': Root folder where your project files are located;		* '''Working copy''': Root folder where your project files are located;

	* '''Repository''' (a.k.a. ''repo''): Inside every '''working copy''' folder, there's an '''.hg''' folder, which is an Hg repository. It stores all change history of your files. Every project developer has one. You can also choose to have a ''main'' repository in a specific computer.		* '''Repository''' (a.k.a. ''repo''): Inside every '''working copy''' folder, there's an '''.hg''' folder, which is an Hg repository. It stores all change history of your files. Every project developer has one. You can also choose to have a ''main'' repository in a specific computer.

	* '''.hgignore''': Similar to ''.cvsignore''. Located at the root of the '''working copy'''. Specifies which files to ignore.		* '''.hgignore''': Similar to ''.cvsignore''. Located at the root of the '''working copy'''. Specifies which files to ignore.

	* '''commit''': Stores inside the '''.hg''' folder (i.e. the ''local'' '''repository''') the changes made to the '''working copy'''. A '''commit''' is stored as a new '''changeset''';		* '''commit''': Stores inside the '''.hg''' folder (i.e. the ''local'' '''repository''') the changes made to the '''working copy'''. A '''commit''' is stored as a new '''changeset''';

	* '''changeset''': Conveys the changes made to a previous state of the '''repository'''. Each changeset has a changeset '''id''', which is a globally unique identifier. Each changeset has a comment;		* '''changeset''': Conveys the changes made to a previous state of the '''repository'''. Each changeset has a changeset '''id''', which is a globally unique identifier. Each changeset has a comment;

	* '''pull''': Brings '''changesets''' from a different '''repository''' to your local one (only changesets that you don't already have);		* '''pull''': Brings '''changesets''' from a different '''repository''' to your local one (only changesets that you don't already have);

	* '''push''': Sends '''changesets''' from you local '''repository''' to a different one (only changesets that don't already exist on the other repository);		* '''push''': Sends '''changesets''' from you local '''repository''' to a different one (only changesets that don't already exist on the other repository);

	* '''clone''': Similar to SVN's ''checkout'' command. When you want to work on a project that you don't have, you '''clone''' the project's '''repository'''		* '''clone''': Similar to SVN's ''checkout'' command. When you want to work on a project that you don't have, you '''clone''' the project's '''repository'''

Elifarley at 01:08, 16 October 2010

2010-10-16T01:08:12Z

← Older revision		Revision as of 01:08, 16 October 2010
Line 2:		Line 2:

	URL: http://mercurial.selenic.com/		URL: http://mercurial.selenic.com/


	==Basic Concepts==		==Basic Concepts==
Line 9:		Line 10:
	* '''commit''': Stores inside the '''.hg''' folder (i.e. the ''local'' '''repository''') the changes made to the '''working copy'''. A '''commit''' is stored as a new '''changeset''';		* '''commit''': Stores inside the '''.hg''' folder (i.e. the ''local'' '''repository''') the changes made to the '''working copy'''. A '''commit''' is stored as a new '''changeset''';
	* '''changeset''': Conveys the changes made to a previous state of the '''repository'''. Each changeset has a changeset '''id''', which is a globally unique identifier. Each changeset has a comment;		* '''changeset''': Conveys the changes made to a previous state of the '''repository'''. Each changeset has a changeset '''id''', which is a globally unique identifier. Each changeset has a comment;
	* '''pull''': Brings changesets from a different '''repository''' to your local one (only changesets that you don't already have);		* '''pull''': Brings '''changesets''' from a different '''repository''' to your local one (only changesets that you don't already have);
	* '''push''': Sends changesets from you local '''repository''' to a different one (only changesets that don't already exist on the other repository);		* '''push''': Sends '''changesets''' from you local '''repository''' to a different one (only changesets that don't already exist on the other repository);
	* '''clone''': Similar to SVN's ''checkout'' command. When you want to work on a project that you don't have, you '''clone''' the project's '''repository'''		* '''clone''': Similar to SVN's ''checkout'' command. When you want to work on a project that you don't have, you '''clone''' the project's '''repository'''


			==Quick Start==

			* Create a project and '''commit'''
			$ hg init ''(project-directory)''
			$ cd ''(project-directory)''
			$ ''(add some files)''
			$ hg add
			$ hg '''commit''' -m 'Initial commit'
			* '''Clone''' a project and '''push''' changes
			$ hg '''clone''' http://selenic.com/repo/hello
			$ cd hello
			$ ''(edit files)''
			$ hg add ''(new files)''
			$ hg '''commit''' -m 'My changes'
			$ hg '''push'''


	==Main Links==		==Main Links==
Line 18:		Line 37:
	* Quick start: http://mercurial.selenic.com/wiki/QuickStart		* Quick start: http://mercurial.selenic.com/wiki/QuickStart
	* Basic introduction to version control and Mercurial: http://www.soton.ac.uk/~fangohr/computing/Mercurial/talk.pdf		* Basic introduction to version control and Mercurial: http://www.soton.ac.uk/~fangohr/computing/Mercurial/talk.pdf


	==More Information==		==More Information==
Line 29:		Line 49:
	* [http://mercurial.selenic.com/wiki/SubversionToMercurialHowto From SVN to Mercurial HOWTO]		* [http://mercurial.selenic.com/wiki/SubversionToMercurialHowto From SVN to Mercurial HOWTO]
	* [http://stackoverflow.com/questions/448567/best-practices-in-mercurial-branch-vs-clone-and-partial-merges Best practices in mercurial: branch vs. clone, and partial merges?]		* [http://stackoverflow.com/questions/448567/best-practices-in-mercurial-branch-vs-clone-and-partial-merges Best practices in mercurial: branch vs. clone, and partial merges?]


	==See Also==		==See Also==

Elifarley: /* Basic Concepts */

2010-10-16T00:55:17Z

Basic Concepts

← Older revision		Revision as of 00:55, 16 October 2010
Line 5:		Line 5:
	==Basic Concepts==		==Basic Concepts==
	* '''Working copy''': Root folder where your project files are located;		* '''Working copy''': Root folder where your project files are located;
	* '''Repository''': Inside every '''working copy''' folder, there's an '''.hg''' folder, which is an Hg repository. It stores all change history of your files. Every project developer has one. You can also choose to have a ''main'' repository in a specific computer.		* '''Repository''' (a.k.a. ''repo''): Inside every '''working copy''' folder, there's an '''.hg''' folder, which is an Hg repository. It stores all change history of your files. Every project developer has one. You can also choose to have a ''main'' repository in a specific computer.
	* '''.hgignore''': Similar to ''.cvsignore''. Located at the root of the '''working copy'''. Specifies which files to ignore.		* '''.hgignore''': Similar to ''.cvsignore''. Located at the root of the '''working copy'''. Specifies which files to ignore.
	* '''commit''': Stores inside the '''.hg''' folder (i.e. the ''local'' '''repository''') the changes made to the '''working copy'''. A '''commit''' is stored as a new '''changeset''';		* '''commit''': Stores inside the '''.hg''' folder (i.e. the ''local'' '''repository''') the changes made to the '''working copy'''. A '''commit''' is stored as a new '''changeset''';
Line 11:		Line 11:
	* '''pull''': Brings changesets from a different '''repository''' to your local one (only changesets that you don't already have);		* '''pull''': Brings changesets from a different '''repository''' to your local one (only changesets that you don't already have);
	* '''push''': Sends changesets from you local '''repository''' to a different one (only changesets that don't already exist on the other repository);		* '''push''': Sends changesets from you local '''repository''' to a different one (only changesets that don't already exist on the other repository);
			* '''clone''': Similar to SVN's ''checkout'' command. When you want to work on a project that you don't have, you '''clone''' the project's '''repository'''

	==Main Links==		==Main Links==

Elifarley at 00:49, 16 October 2010

2010-10-16T00:49:19Z

← Older revision		Revision as of 00:49, 16 October 2010
Line 2:		Line 2:

	URL: http://mercurial.selenic.com/		URL: http://mercurial.selenic.com/

	~~==Main Links==~~
	* http://hginit.com - a Mercurial tutorial by Joel Spolsky
	* Online book: [http://hgbook.red-bean.com/read/ Mercurial: The Definitive Guide]
	* Quick start: http://mercurial.selenic.com/wiki/QuickStart
	* Basic introduction to version control and Mercurial: http://www.soton.ac.uk/~fangohr/computing/Mercurial/talk.pdf

	==Basic Concepts==		==Basic Concepts==
Line 17:		Line 11:
	* '''pull''': Brings changesets from a different '''repository''' to your local one (only changesets that you don't already have);		* '''pull''': Brings changesets from a different '''repository''' to your local one (only changesets that you don't already have);
	* '''push''': Sends changesets from you local '''repository''' to a different one (only changesets that don't already exist on the other repository);		* '''push''': Sends changesets from you local '''repository''' to a different one (only changesets that don't already exist on the other repository);

			==Main Links==
			* http://hginit.com - an excellent Mercurial tutorial by Joel Spolsky
			* Online book: [http://hgbook.red-bean.com/read/ Mercurial: The Definitive Guide]
			* Quick start: http://mercurial.selenic.com/wiki/QuickStart
			* Basic introduction to version control and Mercurial: http://www.soton.ac.uk/~fangohr/computing/Mercurial/talk.pdf

	==More Information==		==More Information==

Elifarley at 00:48, 16 October 2010

2010-10-16T00:48:06Z

← Older revision		Revision as of 00:48, 16 October 2010
Line 1:		Line 1:
	'''~~Distributed~~ source control management tool'''		'''Mercurial, a.k.a. Hg, is a distributed source control management tool'''

	URL: http://mercurial.selenic.com/		URL: http://mercurial.selenic.com/

	==Main Links==		==Main Links==
	* ~~Hg Init~~: a Mercurial tutorial by Joel Spolsky http://~~hginit~~.com		* http://hginit.com - a Mercurial tutorial by Joel Spolsky
	* Quick ~~Start~~: http://mercurial.selenic.com/wiki/QuickStart		* Online book: [http://hgbook.red-bean.com/read/ Mercurial: The Definitive Guide]
			* Quick start: http://mercurial.selenic.com/wiki/QuickStart
	* Basic introduction to version control and Mercurial: http://www.soton.ac.uk/~fangohr/computing/Mercurial/talk.pdf		* Basic introduction to version control and Mercurial: http://www.soton.ac.uk/~fangohr/computing/Mercurial/talk.pdf
	* Hg Book: [http://hgbook.red-bean.com/read/ Mercurial: The Definitive Guide]

	==Basic Concepts==		==Basic Concepts==
	* '''Working copy''': ~~É o diretorio onde ficam os arquivos de seu projeto~~;		* '''Working copy''': Root folder where your project files are located;
	* ~~Repositório~~: ~~Armazena todo o histórico de mudanças feitas nos arquivos do projeto. Fica dentro do diretório .hg (que fica dentro do~~ working copy). ~~Tipicamente~~, ~~um projeto tem ao menos um repositório para cada desenvolvedor que está trabalhando com ele~~.		* '''Repository''': Inside every '''working copy''' folder, there's an '''.hg''' folder, which is an Hg repository. It stores all change history of your files. Every project developer has one. You can also choose to have a ''main'' repository in a specific computer.
	* '''.hgignore''': ~~Se quiser indicar quais arquivos ou pastas devem ser ignorados pelo Mercurial, crie um arquivo com esse nome na raíz do projeto e edite-o conforme for necessário~~.		* '''.hgignore''': Similar to ''.cvsignore''. Located at the root of the '''working copy'''. Specifies which files to ignore.
	* '''commit''': ~~Grava as alterações do~~ working copy ~~dentro do repositório local, na forma de um novo~~ changeset;		* '''commit''': Stores inside the '''.hg''' folder (i.e. the ''local'' '''repository''') the changes made to the '''working copy'''. A '''commit''' is stored as a new '''changeset''';
	* '''changeset''': ~~Conjunto de mudanças~~. ~~É criado quando é feito um commit. Cada~~ changeset ~~possui um identificador único~~, ~~de vários dígitos~~. ~~Cada~~ changeset ~~está associado~~ a ~~exatamente 1 branch~~;		* '''changeset''': Conveys the changes made to a previous state of the '''repository'''. Each changeset has a changeset '''id''', which is a globally unique identifier. Each changeset has a comment;
	* '''~~branch~~''': ~~mesmo conceito do SVN;~~		* '''pull''': Brings changesets from a different '''repository''' to your local one (only changesets that you don't already have);
	* '''~~pull~~'''~~: Traz changesets de um outro repositório para o seu repositório~~ (~~apenas os~~ changesets ~~que não existem no seu repositório~~);		* '''push''': Sends changesets from you local '''repository''' to a different one (only changesets that don't already exist on the other repository);
	* '''push''': ~~Envia~~ changesets ~~do seu repositório para um outro repositório~~ (~~apenas os~~ changesets ~~que não existem no outro repositório~~);

	==More Information==		==More Information==

Elifarley at 15:55, 15 October 2010

2010-10-15T15:55:54Z

Elifarley at 15:55, 15 October 2010

2010-10-15T15:55:15Z

← Older revision		Revision as of 15:55, 15 October 2010
Line 2:		Line 2:

	URL: http://mercurial.selenic.com/		URL: http://mercurial.selenic.com/

			==Main Links==
			* Hg Init: a Mercurial tutorial by Joel Spolsky http://hginit.com
			* Quick Start: http://mercurial.selenic.com/wiki/QuickStart
			* Basic introduction to version control and Mercurial: http://www.soton.ac.uk/~fangohr/computing/Mercurial/talk.pdf
			* Hg Book: [http://hgbook.red-bean.com/read/ Mercurial: The Definitive Guide]

			==Basic Concepts==
			'''Working copy''': É o diretorio onde ficam os arquivos de seu projeto;
			Repositório: Armazena todo o histórico de mudanças feitas nos arquivos do projeto. Fica dentro do diretório .hg (que fica dentro do working copy). Tipicamente, um projeto tem ao menos um repositório para cada desenvolvedor que está trabalhando com ele.
			'''.hgignore''': Se quiser indicar quais arquivos ou pastas devem ser ignorados pelo Mercurial, crie um arquivo com esse nome na raíz do projeto e edite-o conforme for necessário.
			'''commit''': Grava as alterações do working copy dentro do repositório local, na forma de um novo changeset;
			'''changeset''': Conjunto de mudanças. É criado quando é feito um commit. Cada changeset possui um identificador único, de vários dígitos. Cada changeset está associado a exatamente 1 branch;
			'''branch''': mesmo conceito do SVN;
			'''pull''': Traz changesets de um outro repositório para o seu repositório (apenas os changesets que não existem no seu repositório);
			'''push''': Envia changesets do seu repositório para um outro repositório (apenas os changesets que não existem no outro repositório);

			==More Information==
			* [http://betterexplained.com/articles/intro-to-distributed-version-control-illustrated/ Intro to Distributed Version Control (Illustrated)]
			* [[wikipedia:Mercurial_%28software%29\|Mercurial] on Wikipedia
			* [http://mercurial.selenic.com/wiki/ Mercurial Wiki]
			* [http://mercurial.selenic.com/wiki/HOWTOs Mercurial HOWTOs]
			* [http://mercurial.selenic.com/wiki/SuccessStories Mercurial success story]
			* [http://mercurial.selenic.com/wiki/HgWebDirStepByStep Publishing Repositories with hgwebdir.cgi]
			* [http://bazaar-vcs.org/Workflows Workflow examples]
			* [http://mercurial.selenic.com/wiki/SubversionToMercurialHowto From SVN to Mercurial HOWTO]
			* [http://stackoverflow.com/questions/448567/best-practices-in-mercurial-branch-vs-clone-and-partial-merges Best practices in mercurial: branch vs. clone, and partial merges?]

	==See Also==		==See Also==

Elifarley: Added link to Category: Software

2010-10-15T12:11:51Z

Added link to Category: Software

← Older revision		Revision as of 12:11, 15 October 2010
Line 5:		Line 5:
	==See Also==		==See Also==
	* [[Pacha]] - Uses '''Mercurial''' to backup and manage software configuration files from single or multiple server instances across the network.		* [[Pacha]] - Uses '''Mercurial''' to backup and manage software configuration files from single or multiple server instances across the network.

			[[Category: Software]]

Elifarley: Created page with ''''Distributed source control management tool''' URL: http://mercurial.selenic.com/ ==See Also== * Pacha - Uses '''Mercurial''' to backup and manage software configuration …'

2010-10-15T12:00:30Z

Created page with ''''Distributed source control management tool''' URL: http://mercurial.selenic.com/ ==See Also== * Pacha - Uses '''Mercurial''' to backup and manage software configuration …'

New page

'''Distributed source control management tool'''

URL: http://mercurial.selenic.com/

==See Also==
* [[Pacha]] - Uses '''Mercurial''' to backup and manage software configuration files from single or multiple server instances across the network.