Mercurial > hg-website
comparison text/learning_mercurial_in_workflows.txt @ 134:4fc2fc6ddbed
learning in workflows: Added a note that we need a link for information about .hg
| author | Arne Babenhauserheide <bab@draketo.de> |
|---|---|
| date | Fri, 01 May 2009 14:31:32 +0200 |
| parents | 5e1cff189630 |
| children | 8d069bba8cce |
comparison
equal
deleted
inserted
replaced
| 133:5e1cff189630 | 134:4fc2fc6ddbed |
|---|---|
| 183 | 183 |
| 184 If you like the changes, you pull them into the project | 184 If you like the changes, you pull them into the project |
| 185 | 185 |
| 186 $ hg pull ../feature1 | 186 $ hg pull ../feature1 |
| 187 | 187 |
| 188 Now you have the history of feature1 inside your project, but the changes aren't yet visible. Instead they are only stored inside the .hg directory of the project. | 188 Now you have the history of feature1 inside your project, but the changes aren't yet visible. Instead they are only stored inside a .hg directory of the project ([more information on the store]()). |
| 189 | 189 |
| 190 Note: From now on we'll use the name "repository" for a directory which has a .hg directory with Mercurial history. | 190 Note: From now on we'll use the name "repository" for a directory which has a .hg directory with Mercurial history. |
| 191 | 191 |
| 192 If you didn't do any changes in the project, while you were working on feature1, you can just update to tip ("hg update tip"), but it is more likely that you'll have done some other changes in between changes. In that case, it's time for merging. | 192 If you didn't do any changes in the project, while you were working on feature1, you can just update to tip ("hg update tip"), but it is more likely that you'll have done some other changes in between changes. In that case, it's time for merging. |
| 193 | 193 |