|
Size: 3210
Comment: Add named branches
|
Size: 2866
Comment: a clone is not a branch
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 1: | Line 1: |
| (see also UnderstandingMercurial and Tutorial) | (see also UnderstandingMercurial and ["Tutorial"]) |
| Line 5: | Line 5: |
| By default Mercurial uses a username of the form 'user@localhost' for commits. | By default Mercurial uses a username of the form '{{{user@localhost}}}' for commits. |
| Line 15: | Line 15: |
| If you have a URL to a browsable project repository (eg: http://selenic.com/hg), you can grab a copy like so: | If you have a URL to a browsable project [:Repository:repository] (for example [http://selenic.com/hg]), you can grab a copy like so: |
| Line 21: | Line 21: |
| This will create a new directory called hg (by default), grab the complete project history, and check out the tipmost changeset. | This will create a new directory called {{{hg}}} (by default), grab the complete project history, and check out the tipmost [:ChangeSet:changeset] (see also ["Clone"]). |
| Line 25: | Line 25: |
| You'll want to start by creating an hg repository: | You'll want to start by creating a repository: |
| Line 53: | Line 53: |
| This will list all files that are not ignored with a '?' flag (not tracked). Edit your .hgignore file until only files you want to track are listed by status. You'll want to track your .hgignore file too! But you'll probably not want to track files generated by your build process. Once you're satisfied, schedule your files to be added, then commit: | This will list all files that are not ignored with a '?' flag (not tracked). Edit your .hgignore file until only files you want to track are listed by status. You'll want to track your .hgignore file too! But you'll probably not want to track files generated by your build process. Once you're satisfied, schedule your files to be added, then [:Commit:commit]: |
| Line 60: | Line 60: |
| == Branching and merging == There are two ways to do this in recent mercurial releases. First, you can make branches outside of your working directory: |
== Clone, Commit, Merge == |
| Line 66: | Line 63: |
| $ hg clone project project-work # create a new branch | $ hg clone project project-work # clone repository |
| Line 76: | Line 73: |
| or using named branches which appeared in Mercurial 0.9.4: {{{ $ hg branch work # create a new branch $ hg checkout work # switch to it <make changes> $ hg commit $ hg checkout default # switch back to default branch $ hg merge work # merge the branches $ hg commit # commit the result of the merge }}} Note: Named branches can currently not be removed! |
See also: ["Clone"], ["Commit"], ["Merge"] |
| Line 113: | Line 100: |
| '''translations:''' [:QuickStartDe:german] | '''translations:''' [:QuickStartDe:german] [:QuickStartPtBr:portuguese] |
(see also UnderstandingMercurial and ["Tutorial"])
Setting a username
By default Mercurial uses a username of the form 'user@localhost' for commits. This is often meaningless. It's best to configure a proper email address in ~/.hgrc (or on a Win system %USERPROFILE%\Mercurial.ini) by adding lines such as the following:
[ui] username = Author Name <email@address>
Working on an existing Mercurial project
If you have a URL to a browsable project [:Repository:repository] (for example [http://selenic.com/hg]), you can grab a copy like so:
$ hg clone http://selenic.com/hg
This will create a new directory called hg (by default), grab the complete project history, and check out the tipmost [:ChangeSet:changeset] (see also ["Clone"]).
Setting up a new Mercurial project
You'll want to start by creating a repository:
$ cd project/ $ hg init # creates .hg
Mercurial will look for a file named [".hgignore"] in the root of your repository which contains a set of glob patterns and regular expressions to ignore in file paths. Here's an example .hgignore file:
syntax: glob *.orig *.rej *~ *.o tests/*.err syntax: regexp .*\#.*\#$
Test your .hgignore file with:
$ hg status # show all non-ignored files
This will list all files that are not ignored with a '?' flag (not tracked). Edit your .hgignore file until only files you want to track are listed by status. You'll want to track your .hgignore file too! But you'll probably not want to track files generated by your build process. Once you're satisfied, schedule your files to be added, then [:Commit:commit]:
$ hg add # add those 'unknown' files $ hg commit # commit all changes, edit changelog entry
Clone, Commit, Merge
$ hg clone project project-work # clone repository $ cd project-work $ <make changes> $ hg commit $ cd ../project $ hg pull ../project-work # pull changesets from project-work $ hg merge # merge the new tip from project-work into our working directory $ hg commit # commit the result of the merge
See also: ["Clone"], ["Commit"], ["Merge"]
Exporting a patch
(make changes) $ hg commit $ hg export tip # export the most recent commit
Network support
# clone from the primary Mercurial repo foo$ hg clone http://selenic.com/hg/ foo$ cd hg # update an existing repo foo$ hg pull http://selenic.com/hg/ # export your current repo via HTTP with browsable interface foo$ hg serve -n "My repo" -p 80 # push changes to a remote repo with SSH foo$ hg push ssh://user@example.com/hg/
translations: [:QuickStartDe:german] [:QuickStartPtBr:portuguese]