`hg pull --rebase`类似于`svn update`吗？

Question

This question assumes there's a "blessed" central repository that members of a team

1. clone from
2. push to when they have contributions that they want other team members to see
3. pull from when they want to see other people's contributions.
4. etc.

If so, I would assume hg update is not analogous to svn update (why would there be two commands that do exactly the same thing?). From what I can gather, hg update more like svn revert . Is that correct?

Update:

My understanding of rebase is largely based on the "A common case" section on this page:
https://www.mercurial-scm.org/wiki/RebaseProject

Answer 1

As others have indicated, almost but not quite. In order of decreasing similarity to svn update (and increasing compliance with general DVCS, and specifically Mercurial, best practices[1]):

1. hg pull -u (or hg pull followed by hg update ) with your changes uncommitted and no committed changes since your last pull. This is as close to svn update as you can get, but is pretty bad DVCS practice. One of the niceties of DVCS is that you can commit your changes before trying to merge them with others, and thus have a backup version to rollback and retry a failed merge, and this practice gives that up. Don't do it.

2. hg pull --rebase after committing your changes. This pulls the upstream changes, re-applies your changes on top of them, and lets you push your changes back as a linear history. The end result will look very similar to a Subversion revision history, but you get the DVCS benefit of committing before merging. I do not know how the safety of this mode of operation compares between Mercurial and Git, though; in Git, pre-rebase versions of your changes will still be there until you do a git gc , but Mercurial doesn't have an explicit gc safety net.

3. hg pull followed by hg merge with your changes already committed to your local copy. This is the traditional Mercurial practice for doing the functional analog of svn update , notwithstanding footnote 1 below. This results in a nonlinear version history, but all changes are tracked and inspectable.

That said, there is much wisdom in thinking of Mercurial (and other DVCSes) on their own terms, and not trying to translate from Subversion/CVS-style thinking.

1. If you are not of the rewrite-history-to-keep-it-linear school of thought. If you are, then rebase is probably preferable to update . The Mercurial community tends to favor update .

Answer 2

Not exactly.

hg pull grabs the revisions from the other repository and adds them to the locally available revisions in your clone of the repository, but does not update your working copy - only your repository (which, for DCVS like hg/git/etc is not the same thing as a working copy).

hg update updates your actual working copy to the latest revision in your local repository.

This differs from Subversion because in svn, there is no such thing as your "local repository" - the only repository is the one on the server; you only have a working copy locally. Hence why update is only a single command, as opposed to Mercurial's pull and then update .

The equivalent to svn update for Mercurial would be hg pull --update , which is equivalent to doing hg pull and then hg update one after another.

An end-to-end workflow for DCVS with a "central" repo looks something like this:

1. A does hg commit on some changes.
2. A does hg push to push them the central repository.
3. B does hg pull to pull them from the central repository into their own clone.
4. B does hg update to update their working copy to reflect the changes pulled into their clone.

In systems without a central repo, it would instead look something like this:

1. A does hg commit on some changes.
2. B, who has cloned A's repo, wants those changes, and thus does an hg pull directly from A's repo.
3. B uses hg update to update their working copy to the changes.

Also, the equivalent to svn revert is hg revert . :)

Answer 3

hg pull --update

would be an equivalent of svn update

As described in this SO question

The hg command push and pull move changes between repositories and update and commit moves changes between your working copy and your local repository.

So in a DVCS, you have 2 notions instead of one:

• local repo (pull/push)
• working directory (which is the only local representation of the "tip" of a repo with SVN)

Answer 4

Here's a great beginners guide to mercurial http://hginit.com/ . Should explain most things clearly. Starting off with "Do not try and apply svn knowledge to distributed vcs's"!

Answer 5

The command hg pull --rebase isn't exactly analogous to svn update , but the result can be the same.

In Subversion, if you update your working copy you get the latest changes in the repository merged in with any local changes. So the files in your repository are up to date but you might still have uncommitted changes.

In Mercurial, hg pull --rebase , will get the latest changes from the 'central repository' (or whatever repository you're pulling from) to update your repository then shuffle along your local commits. You'll still need an hg update to make your working copy the same as your local repository.