equal
deleted
inserted
replaced
213 $ hg add chapter1.txt |
213 $ hg add chapter1.txt |
214 adding chapter1.txt |
214 adding chapter1.txt |
215 |
215 |
216 |
216 |
217 **Note**: If you have deleted files, ``hg status`` will show you the status |
217 **Note**: If you have deleted files, ``hg status`` will show you the status |
218 code ``!``. You can then, tell ``hg`` to stop tracking these files, using the |
218 code ``!``. You can, then, tell ``hg`` to stop tracking these files, using |
219 ``hg remove`` command. Look at ``hg help remove`` for more details. |
219 the ``hg remove`` command. Look at ``hg help remove`` for more details. |
220 |
220 |
221 Taking Snapshots |
221 Taking Snapshots |
222 ---------------- |
222 ---------------- |
223 |
223 |
224 We have added a set of new files to the repository, but we haven't told |
224 We have added a set of new files to the repository, but we haven't told |
299 Let us now make another commit to see if this has taken effect. Let us |
299 Let us now make another commit to see if this has taken effect. Let us |
300 add author information to all the chapters that we have. |
300 add author information to all the chapters that we have. |
301 |
301 |
302 :: |
302 :: |
303 |
303 |
304 Author: Puneeth Chaganti <punchagan@fossee.in> |
304 Author: Puneeth Chaganti |
305 |
305 |
306 |
306 |
307 Once we have added this to all the files, let us commit this change. We again |
307 Once we have added this to all the files, let us commit this change. We again |
308 used the ``hg commit`` command to commit the changes that we have made. |
308 used the ``hg commit`` command to commit the changes that we have made. |
309 |
309 |
600 --- a/chapter1.txt Fri Jan 28 16:24:42 2011 +0530 |
600 --- a/chapter1.txt Fri Jan 28 16:24:42 2011 +0530 |
601 +++ b/chapter1.txt Fri Jan 28 23:03:37 2011 +0530 |
601 +++ b/chapter1.txt Fri Jan 28 23:03:37 2011 +0530 |
602 @@ -2,6 +2,7 @@ |
602 @@ -2,6 +2,7 @@ |
603 ======================= |
603 ======================= |
604 |
604 |
605 Author: Puneeth Chaganti <punchagan@fossee.in> |
605 Author: Puneeth Chaganti |
606 + Madhusudan CS <madhusudancs@fossee.in> |
606 + Madhusudan CS |
607 Date: 2011-01-28 13:58:47 IST |
607 Date: 2011-01-28 13:58:47 IST |
608 |
608 |
609 |
609 |
610 @@ -9,8 +10,9 @@ |
610 @@ -9,8 +10,9 @@ |
611 Table of Contents |
611 Table of Contents |
690 searching for changes |
690 searching for changes |
691 changeset: 3:3cd54926dbea |
691 changeset: 3:3cd54926dbea |
692 tag: tip |
692 tag: tip |
693 user: Madhusudan CS <madhusudancs@fossee.in> |
693 user: Madhusudan CS <madhusudancs@fossee.in> |
694 date: Fri Jan 28 23:08:25 2011 +0530 |
694 date: Fri Jan 28 23:08:25 2011 +0530 |
695 summary: Add my name to authors and move getting repositories section |
695 summary: Add myself as author; Move getting repositories to section 5 |
696 to 5 |
|
697 |
696 |
698 |
697 |
699 To now **pull** these changes, we use the ``pull`` command. |
698 To now **pull** these changes, we use the ``pull`` command. |
700 |
699 |
701 :: |
700 :: |
738 $ hg parent |
737 $ hg parent |
739 changeset: 3:3cd54926dbea |
738 changeset: 3:3cd54926dbea |
740 tag: tip |
739 tag: tip |
741 user: Madhusudan CS <madhusudancs@fossee.in> |
740 user: Madhusudan CS <madhusudancs@fossee.in> |
742 date: Fri Jan 28 23:08:25 2011 +0530 |
741 date: Fri Jan 28 23:08:25 2011 +0530 |
743 summary: Add my name to authors and move getting repositories section |
742 summary: Add myself as author; Move getting repositories to section 5 |
744 to 5 |
|
745 |
743 |
746 As expected the **update** command updates the parent to the latest changes |
744 As expected the **update** command updates the parent to the latest changes |
747 that we just pulled from the remote repository. |
745 that we just pulled from the remote repository. |
748 |
746 |
749 The update command can also be used to go back into an older revision, by |
747 The update command can also be used to go back into an older revision, by |
771 $ hg parent |
769 $ hg parent |
772 changeset: 3:3cd54926dbea |
770 changeset: 3:3cd54926dbea |
773 tag: tip |
771 tag: tip |
774 user: Madhusudan CS <madhusudancs@fossee.in> |
772 user: Madhusudan CS <madhusudancs@fossee.in> |
775 date: Fri Jan 28 23:08:25 2011 +0530 |
773 date: Fri Jan 28 23:08:25 2011 +0530 |
776 summary: Add my name to authors and move getting repositories section |
774 summary: Add myself as author; Move getting repositories to section 5 |
777 to 5 |
|
778 |
775 |
779 Simultaneous Changes |
776 Simultaneous Changes |
780 -------------------- |
777 -------------------- |
781 |
778 |
782 Ok, we have been talking about collaboration, but this is a nice situation, |
779 Ok, we have been talking about collaboration, but this is a nice situation, |