Mercurial > hg-website
changeset 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 |
| files | text/learning_mercurial_in_workflows.txt |
| diffstat | 1 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/text/learning_mercurial_in_workflows.txt Fri May 01 13:55:17 2009 +0200 +++ b/text/learning_mercurial_in_workflows.txt Fri May 01 13:56:03 2009 +0200 @@ -155,7 +155,16 @@ $ hg clone project feature1 $ cd feature1 $ (do some changes and commits) + +$ Now check what will come in when you pull from feature1, just like you can use "diff" before committing + $ cd ../project +$ hg incoming ../feature1 + +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. + +If you like the changes, you pull them into the project + $ hg pull ../feature1 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.