Re: [LIP] cvs confusion
Raj Mathur <[email protected]>
| Newsgroups | gmane.user-groups.linux.india.programmers |
|---|---|
| Message-ID | <[email protected]> |
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 >>>>> "Kenneth" == Kenneth Gonsalves <[email protected]> writes: Kenneth> hi, i have just started using cvs on a live project and Kenneth> am a bit confused (scratch that! thoroughly Kenneth> confused). This is the scenario as i understand it Kenneth> 1. Checkout the cvs contents into my sandbox 2. first Kenneth> thing in the morning update my sandbox - myfile.py is now Kenneth> in sync with the cvs version 3. i work on myfile.py and Kenneth> make several changes 4. before i commit, another Kenneth> developer has committed some changes to myfile.py 5. if i Kenneth> run update before committing, i would lose my changes to Kenneth> myfile.py? 6. and if i commit before updating the other Kenneth> guy would lose his changes? -- regards kg One word answer: No. Longer story: CVS will warn you if you try to check in a file that someone else has edited and checked in after you checked it out. A fresh ``cvs update'' will merge the changes in the file with your changes. In case of potentially conflicting changes, ``If any of the changes [were] made too close to any of the changes you have made, an overlap occurs. In such cases a warning is printed, and the resulting file includes both versions of the lines that overlap, delimited by special markers.'' Full story: http://www.rons.net.cn/htp/cvs/cvs_10.html Regards, - -- Raju - -- Raj Mathur [email protected] http://kandalaya.org/ GPG: 78D4 FC67 367F 40E2 0DD5 0FEF C968 D0EF CC68 D17F It is the mind that moves -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) Comment: Processed by Mailcrypt 3.5.8 <http://mailcrypt.sourceforge.net/> iD8DBQFA0TN8yWjQ78xo0X8RAlBsAJsFkMyESeHCyhceguP8SV8BkvC+cgCeN/sW 3U4EnWuGD4AkoqKF4MTE0SE= =2uFH -----END PGP SIGNATURE----- ------------------------------------------------------- This SF.Net email is sponsored by The 2004 JavaOne(SM) Conference Learn from the experts at JavaOne(SM), Sun's Worldwide Java Developer Conference, June 28 - July 1 at the Moscone Center in San Francisco, CA REGISTER AND SAVE! http://java.sun.com/javaone/sf Priority Code NWMGYKND