|
Size: 3239
Comment:
|
Size: 2589
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 1: | Line 1: |
| (see also UnderstandingMercurial and Tutorial) |
|
| Line 62: | Line 64: |
| $ hg clone linux linux-work # create a new branch $ cd linux-work |
$ hg clone project project-work # create a new branch $ cd project-work |
| Line 66: | Line 68: |
| $ cd ../linux $ hg pull ../linux-work # pull changesets from linux-work $ hg merge # merge the new tip from linux-work into # (old versions used "hg update -m" instead) # our working directory |
$ cd ../project $ hg pull ../project-work # pull changesets from project-work $ hg merge # merge the new tip from project-work into our working directory |
| Line 72: | Line 72: |
| }}} == Importing patches == Fast: {{{ $ patch < ../p/foo.patch $ hg addremove # add and remove files added/removed by the patch $ hg commit }}} Faster: {{{ $ patch < ../p/foo.patch $ hg commit `lsdiff -p1 ../p/foo.patch` }}} Fastest: {{{ $ cat ../p/patchlist | xargs hg import -p1 -b ../p |
|
| Line 99: | Line 79: |
| $ hg tip 28237:747a537bd090880c29eae861df4d81b245aa0190 $ hg export 28237 > foo.patch # export changeset 28237 |
$ hg export tip # export the most recent commit |
| Line 107: | Line 85: |
| # pull from the primary Mercurial repo | # clone from the primary Mercurial repo |
| Line 110: | Line 88: |
# update an existing repo foo$ hg pull http://selenic.com/hg/ |
|
| Line 114: | Line 95: |
| # pushing changes to a remote repo with SSH foo$ hg push ssh://user@example.com/~/hg/ # merge changes from a remote machine bar$ hg pull http://foo/ bar$ hg merge # merge changes into your working directory # Set up a CGI server on your webserver foo$ cp hgwebdir.cgi ~/public_html/hg/index.cgi foo$ emacs ~/public_html/hg/index.cgi # adjust the defaults |
# push changes to a remote repo with SSH foo$ hg push ssh://user@example.com/hg/ |
(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 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 (eg: 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.
Setting up a new Mercurial project
You'll want to start by creating an hg 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 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 'U' flag (unknown). 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:
$ hg add # add those 'unknown' files $ hg commit # commit all changes, edit changelog entry
Branching and merging
$ hg clone project project-work # create a new branch $ 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
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/