|
Size: 1551
Comment: Refer to Merge page (nearly identical text)
|
Size: 732
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 3: | Line 3: |
| See [:Merge:merge] | See [[Merge|merge]] |
| Line 7: | Line 7: |
| First, merge often! This makes merging easier for everyone and you find out about conflicts (which are often rooted in incompatible design decisions) earlier. Second, don't hesitate to use multiple trees locally. Mercurial makes this fast and light-weight. Typical usage is to have an incoming tree, an outgoing tree, and a separate tree for each area being worked on. The incoming tree is best maintained as a pristine copy of the upstream [:Repository:repository]. This works as a cache so that you don't have to [:Pull:pull] multiple copies over the network. No need to check files out here as you won't be changing them. The outgoing tree contains all the changes you intend for merge into upstream. Publish this tree with {{{hg serve}}} or hgweb.cgi or use {{{hg push}}} to [:Push:push] it to another publicly availabe repository. Then, for each feature you work on, create a new tree. Commit early and commit often, merge with incoming regularly, and once you're satisfied with your feature, pull the changes into your outgoing tree. |
See [[WorkingPractices]] |
| Line 32: | Line 11: |
| See [:ConvertingRepositories] for various tips. | See [[ConvertingRepositories]] for various tips. |
| Line 36: | Line 15: |
| See [:WindowsInstall] for getting started using Windows. | See [[WindowsInstall]] for getting started using Windows. Like TortoiseSVN, [[http://www.selenic.com/pipermail/mercurial/2010-January/029680.html|we recommend]] to to turn off the indexing service on the working copies and repositories, and exclude them from virus scans. |
| Line 40: | Line 22: |
| See [:GUIClients] for information on graphical merge tools and other front-ends. | See [[OtherTools]] for information on graphical merge tools and other front-ends. |
How does merging work?
See merge
What are some best practices for distributed development with Mercurial?
See WorkingPractices
How do I import from a repository created in a different SCM?
See ConvertingRepositories for various tips.
What about Windows support?
See WindowsInstall for getting started using Windows.
Like TortoiseSVN, we recommend to to turn off the indexing service on the working copies and repositories, and exclude them from virus scans.
Is there a GUI front-end?
See OtherTools for information on graphical merge tools and other front-ends.