Mercurial > hg-website
comparison text/learning_mercurial_in_workflows.txt @ 131:59b5985db58a
learning in workflows: added 'incoming'
| author | Arne Babenhauserheide <bab@draketo.de> |
|---|---|
| date | Fri, 01 May 2009 13:56:03 +0200 |
| parents | 77b10482cc47 |
| children | a7fb926c69f6 |
comparison
equal
deleted
inserted
replaced
| 130:77b10482cc47 | 131:59b5985db58a |
|---|---|
| 153 === Workflow === | 153 === Workflow === |
| 154 | 154 |
| 155 $ hg clone project feature1 | 155 $ hg clone project feature1 |
| 156 $ cd feature1 | 156 $ cd feature1 |
| 157 $ (do some changes and commits) | 157 $ (do some changes and commits) |
| 158 | |
| 159 $ Now check what will come in when you pull from feature1, just like you can use "diff" before committing | |
| 160 | |
| 158 $ cd ../project | 161 $ cd ../project |
| 162 $ hg incoming ../feature1 | |
| 163 | |
| 164 Note: If you want to see the diffs, you can use "hg incoming --patch" just as you can do with "hg log --patch" for the changes in the repository. | |
| 165 | |
| 166 If you like the changes, you pull them into the project | |
| 167 | |
| 159 $ hg pull ../feature1 | 168 $ hg pull ../feature1 |
| 160 | 169 |
| 161 Now you have the history of feature1 inside your project, but they aren't yet visible. Instead they are only stored inside the .hg directory inside the project. | 170 Now you have the history of feature1 inside your project, but they aren't yet visible. Instead they are only stored inside the .hg directory inside the project. |
| 162 | 171 |
| 163 Note: From now on we'll use the name "repository" for a directory which has a .hg directory with Mercurial history. | 172 Note: From now on we'll use the name "repository" for a directory which has a .hg directory with Mercurial history. |