|
Size: 7593
Comment: Added explanatory diagrams.
|
Size: 8483
Comment: Added diagrams and headings.
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 70: | Line 70: |
=== The basic workflow in Mercurial === |
|
| Line 110: | Line 112: |
| If you do not perform the `hg update` you can keep working and ignore other people's work - it will be available in your own clone - but ultimately you are likely to want to combine your own work with theirs. The single command equivalent of `cvs update` is really... | The single command equivalent of `cvs update` is really... |
| Line 115: | Line 117: |
=== Working independently === If you perform the `hg pull` but not the `hg update` you can keep working and ignore other people's work, but you will be able to see what they did. {{{#!dot digraph G { subgraph { node [shape="box"] rank=same before1 [label="..."]; start1 [label="start"]; } subgraph { node [shape="box"] rank=same before2 [label="..."]; sc [shape="none"; label=< <table border='0' cellspacing='10' cellpadding='10'><tr><td port='start2' border='1' >start</td></tr><tr><td port='committed2' border='1'>committed</td></tr></table> >]; } checkout [label="working files"]; before1 -> start1; before2 -> sc:start2; before2 -> sc:committed2; start1 -> sc:start2 [label="pull"]; before2 -> checkout:w [label="(previous) update"]; checkout:e -> sc:committed2 [label="commit"]; } }}} Ultimately you are likely to want to combine your own work with theirs, so an [[Update|update]] will need to happen at some stage. |
|
| Line 149: | Line 183: |
| When pushing, however, `hg push` may complain about multiple heads being created which means that the content of the repository has been edited in different ways and has not been reconciled. Multiple heads can exist in the remote repository, but this leaves any work for reconciling the competing changes for later, which may not be desirable. | === Conflicts and merging in Mercurial === When pushing, `hg push` may complain about multiple heads being created which means that the content of the repository has been edited in different ways and has not been reconciled. Multiple heads can exist in the remote repository, but this leaves any work for reconciling the competing changes for later, which may not be desirable. |
CVS-like Working Practice
Mercurial allows multiple working practices. In a CVS-like world, you will typically have one central repository; let's call it the "main line". This corresponds to CVS's notion of the "trunk".
Repositories tend to be long-lived, and the "authoritative branches" are clones of the central repository.
Workflow
Developers have direct SSH access (whether that is through "normal" SSH access with each developer having their own login, or through shared SSH logins) to the central repositories on a server, and push their changes directly from their local clones into the appropriate repositories. Thus, the usual CVS practice would be as follows:
# Check for work done... cvs update # Do work, consider changes... cvs diff # Commit changes... cvs commit
This doesn't always work out, and so the following workflow is typically required if cvs commit complains:
# Rectify conflicts, then... cvs update # Edit conflicts, then commit... cvs commit
The basic workflow in Mercurial
The corresponding practice would be as follows with Mercurial:
# Check for work done (part of the update operation in CVS)... hg pull # Start working with the latest changes (part of the update operation in CVS)... hg update # Do work, consider changes... hg diff # Commit changes (part of the commit operation in CVS)... hg commit # Push changes (part of the commit operation in CVS)... hg push
The single command equivalent of cvs update is really...
hg pull -u
Working independently
If you perform the hg pull but not the hg update you can keep working and ignore other people's work, but you will be able to see what they did.
Ultimately you are likely to want to combine your own work with theirs, so an update will need to happen at some stage.
Note that before pushing changes, the developer is free to commit as many changesets as they like without being affected by people working elsewhere.
Conflicts and merging in Mercurial
When pushing, hg push may complain about multiple heads being created which means that the content of the repository has been edited in different ways and has not been reconciled. Multiple heads can exist in the remote repository, but this leaves any work for reconciling the competing changes for later, which may not be desirable.
To reconcile competing changes, the following workflow becomes necessary:
# Get the remote changes and merge them... hg pull hg merge # Edit any conflicts, then commit... hg commit # Push merged changes... hg push
Again, the developer can defer pushing changes until later. The principal advantage of Mercurial here is that the developer need not be confronted with merging others' changes on every commit.
Branches and merging
Someone may be responsible for "backporting" changes from a branch to the main line. They do this by pulling changes from the branch and the main line into a local repository, merging appropriately, then pushing back to the main line.
When the main line reaches a release point, someone creates a clone on the server at the appropriate revision, and people who need to work on that branch clone it, then start pushing their changes back.
See also
CVS commands and their equivalents in Mercurial