| <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><HTML> |
| <HEAD> |
| <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> |
| <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> |
| |
| <LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> |
| <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>You will simultaneously make changes to file2.txt and file3.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> |
| <P CLASS="Para">Open the preferences (<b>Window > Preferences</b>) and turn on |
| the CVS label decorations (on page <b>Workbench > Label Decorations</b> check off |
| <b>CVS</b>).</P> |
| <blockquote> |
| <P CLASS="Para"><img src="../images/Image84_decorator_preference.gif" alt="Navigator View" border="0" width="531" height="440"></P> |
| </blockquote> |
| <P CLASS="Para">Observe that the Navigator updates the CVS state |
| of a resource. Notice that the two files which Fred has changed are |
| preceded by ">".</P> |
| <blockquote> |
| <P CLASS="Para"><img src="../images/Image83_fred_verson.gif" alt="Navigator View" border="0" width="272" height="159"> </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. </p> |
| </li> |
| <li>When the Synchronize view opens Fred should |
| commit his changes to file1.txt and file2.txt. </li> |
| </ol> |
| |
| |
| <P> <br> |
| <a href="../hglegal2003.htm"><img src="../images/ngibmcpy2003.gif" alt="Copyright IBM Corporation 2000, 2003. All Rights Reserved." border="0" width="324" height="14" ></a> |
| </P> |
| |
| |
| </BODY> |
| </HTML> |
