RE: Use of Update Options, Reset any sticky tags/date/kopts - erased file!
"Arthur Barrett" <[email protected]> Wed, 31 Aug 2011 11:47:11 +1100
| Newsgroups | gmane.comp.version-control.cvs.gui.user |
|---|---|
| Message-ID | <[email protected]> |
Collette, WinCVS is just a GUI, the tool that is doing the work is CVSNT. If you are using CVSNT as the basis of your versioning, I strongly recommend reading a book or two about it or getting some training. Jens has already answered where you *may* find a copy of the deleted file, so I'll answer the other half of your questio - about the process. If you are working on branch JUNE_BRANCH and want to have the changes made to 'hello.cpp' now available on Trunk then the correct procedure is: 1) commit your work to JUNE_BRANCH c: cd \path\to\sandbox cvs ci -m "my changes" 2) create a new sandbox/workspace for Trunk c: cd \path\to\emptydir cvs -d :sspi:host:/myrepo co mymodule 3) merge from JUNE_BRANCH to Trunk c: cd \path\to\emptydir\mymodule cvs up -j JUNE_BRANCH Note: WinCVS doesn't support most of the modern features of CVSNT, eg: user defined changesets, Access Control Lists, MergePoints etc - so I recommend you upgrade your GUI to TortoiseCVS or even better CVS Suite (the profits from which go to developing CVSNT). Regards, Arthur Barrett Product Manager - CVSNT > -----Original Message----- > From: [email protected] [mailto:[email protected]] > On Behalf Of collette.parr > Sent: Tuesday, 30 August 2011 4:28 AM > To: [email protected] > Subject: [cvsgui] Use of Update Options, Reset any sticky > tags/date/kopts - erased file! > > > In trying to move a file on a branch back to the mainline of > code, we went to Modify, Update Options, and selected the > Sticky options: Reset any sticky tags/date/kopts. When we > refreshed the screen in WinCVS, the file was not listed. > We searched for the local copy on the software engineer's > hard drive, and it was not there. It also was not in > SourceForge (our code repository tool), nor could I see it on > the backend in the file structure in /cvsroot on the server. > It appears that this option erased the file from existence! > Is this a known error? What did we do wrong? > Any help would be greatly appreciated as this represents > quite a bit of lost work. > Thanks, > Collette > > > > ------------------------------------ > > Yahoo! Groups Links > > > > ------------------------------------ Yahoo! Groups Links <*> To visit your group on the web, go to: http://groups.yahoo.com/group/cvsgui/ <*> Your email settings: Individual Email | Traditional <*> To change settings online go to: http://groups.yahoo.com/group/cvsgui/join (Yahoo! ID required) <*> To change settings via email: [email protected] [email protected] <*> To unsubscribe from this group, send an email to: [email protected] <*> Your use of Yahoo! Groups is subject to: http://docs.yahoo.com/info/terms/