| <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> |
| <html> |
| <head> |
| |
| <meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > |
| |
| <meta content="text/html; charset=ISO-8859-1" |
| http-equiv="Content-Type"> |
| <meta content="text/css" http-equiv="Content-Style-Type"> |
| <link type="text/css" charset="ISO-8859-1" href="../book.css" |
| rel="STYLESHEET"> |
| <title>Another user making changes</title> |
| </head> |
| <body bgcolor="#ffffff"> |
| <h3> |
| Another user making changes</h3> |
| <p class="Para">Now that Fred has the project in his Workbench he needs |
| to modify several of the files and synchronize with the repository in |
| order to commit them.</p> |
| <ul> |
| <li>Fred will make changes to file1.txt and file2.txt</li> |
| <li>Fred will synchronize and commit his outgoing changes to the two files.</li> |
| </ul> |
| <p class="Para">Fred should proceed as follows:</p> |
| <ol> |
| <li>Modify file1.txt as follows |
| <p>Original contents:</p> |
| <blockquote> |
| <p><i>This is the contents<br> |
| of file 1.</i></p> |
| </blockquote> |
| <p>New contents (changes shown in bold):</p> |
| <blockquote> |
| <p><i>This is the contents<br> |
| <b>Fred-update </b><br> |
| of file 1.</i></p> |
| </blockquote> |
| </li> |
| <li>Modify file2.txt as follows |
| <p>Original contents:</p> |
| <blockquote> |
| <p><i>File2 is a small file<br> |
| with simple text.</i></p> |
| </blockquote> |
| <p>New contents (changes shown in bold):</p> |
| <blockquote> |
| <p><i>File2 is a (<b>Fred was here) </b>small file<br> |
| with simple text. </i></p> |
| </blockquote> |
| </li> |
| <li>Observe that the Navigator updates the CVS state of a resource. |
| Notice |
| that the two files which Fred has changed are preceded by ">". |
| <blockquote> |
| <p class="Para"><img src="../images/Image83_fred_verson.png" alt="Navigator View"> |
| </p> |
| </blockquote> |
| </li> |
| <li>To commit his changes to the repository Fred can either: |
| <ul> |
| <li>Select the two files and choose <b>Team > Synchronize |
| with Repository</b> or,</li> |
| <li>Select the project and choose <b>Team > Synchronize with |
| Repository</b></li> |
| </ul> |
| <p>Often choosing the project is the easiest thing to do. Let's do |
| that. Select the project and choose <b>Team > Synchronize with |
| Repository</b> from its context menu. When you are asked to switch to |
| the Team Synchronizing perspective select <span |
| style="font-weight: bold;">Yes</span>.<br> |
| <br> |
| <img src="../images/Image83_fred_verson2.png"> |
| <br> |
| <br> |
| </p> |
| </li> |
| <li>When the Synchronize View opens Fred can browse the changes he |
| made and at the end should commit his changes to |
| file1.txt and file2.txt by selecting JanesTeamProject in the |
| Synchronize View and from the context menu select <span |
| style="font-weight: bold;">Commit</span>. You will have to enter a |
| commit comment before committing the changes.<br> |
| </li> |
| </ol> |
| |
| </body> |
| </html> |
