Disregard. The developer is smoking something, and frankly I feel like I have too.
Feel free to have a laugh at my expense, Ryan -----Original Message----- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Koziel, Ryan Sent: Monday, April 03, 2006 2:06 PM To: [email protected] Subject: RE: branch problem More info. Looks like the developer had the version of code checked out for awhile without doing a CVS update to get the latest and greatest (had it checked out since 1.8). So once he committed his changes, it removed the changes already committed up to that point. Would it be easier to just checkout the 1.11 version of this file, and then commit it back into the branch. Or is there a way to merge out those changes done in 1.8.4.1? I am having some trouble figuring this one out. Thanks, Ryan -----Original Message----- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Koziel, Ryan Sent: Monday, April 03, 2006 1:59 PM To: [email protected] Subject: branch problem Have a problem here. Looks like a developer here has checked in code that somehow "undid" changes made in a previous version. The current version of this file is 1.8.4.1. The changes checked in for that version removed the changes done in version 1.10 and 1.11. We try to keep all development on the trunk, however we branch off the latest releases of code to implement in our production environments - development fixes and enhancements continue on the branches while the developer has the responsibility to implement those same changes in the trunk (no cvs merging). Am I missing something with how, if, these changes actually are not there as the developer states? Any information would be very helpful. Below is the cvs log entry for the file in question. Thanks in advance, Ryan Koziel [mil-acpv-cm2 - kozr01:] /compile/kozr01/temp/VoiceSDS/domain/lib/lwfm > cvs log WFMUtility.cpp RCS file: /ios/cm/SrcRep/VoiceSDS/domain/lib/lwfm/WFMUtility.cpp,v Working file: WFMUtility.cpp head: 1.11 branch: locks: strict access list: symbolic names: rel-6-9-1: 1.8.0.4 rel-6-9-0: 1.8.0.2 rel-6-8-1: 1.5.0.2 Build_Aug-27-2004: 1.3 Build_Jun-10-2004: 1.3 Build_Jun-7-2004: 1.2 Baseline: 1.1.1.1 CSG: 1.1.1 keyword substitution: kv total revisions: 15; selected revisions: 15 description: ---------------------------- revision 1.11 date: 2006/03/08 20:04:29; author: mism01; state: Exp; lines: +0 -1 removed WFMAccountItem include. ---------------------------- revision 1.10 date: 2006/03/08 18:19:29; author: mism01; state: Exp; lines: +15 -45 D05I179T - Support Calling Card Inventory. Removed account service category contr checks in UpdateOrderLine. Also inlined WFMAccountItem SetServiceDate functionality. ---------------------------- revision 1.9 date: 2006/03/07 20:36:08; author: mism01; state: Exp; lines: +2 -49 Removed WFM Repair Processing logic. ---------------------------- revision 1.8 date: 2006/01/10 16:20:44; author: turm01; state: Exp; lines: +1 -1 branches: 1.8.4; IR: 444148 Added process task status of 'ASSIGNED' and 'PND_SCHD' to the taskCount query. ---------------------------- revision 1.7 date: 2005/11/30 23:57:00; author: mism01; state: Exp; lines: +13 -12 R 451124 - Fixed memory leak issue due to reuse of DBAParameters and DBAColumns objects. ---------------------------- revision 1.6 date: 2005/11/30 20:46:47; author: mism01; state: Exp; lines: +17 -1 IR 451124 - Fixed memory leak issue due to reuse of DBAParameters and DBAColumns objects. ---------------------------- revision 1.5 date: 2005/11/08 22:19:10; author: bars03; state: Exp; lines: +147 -0 branches: 1.5.2; D051134P ---------------------------- revision 1.4 date: 2004/10/14 16:12:28; author: dosa01; state: Exp; lines: +3 -3 *** empty log message *** ---------------------------- revision 1.3 date: 2004/06/09 23:30:09; author: dosa01; state: Exp; lines: +1 -1 *** empty log message *** ---------------------------- revision 1.2 date: 2004/06/03 20:17:30; author: dosa01; state: Exp; lines: +2 -2 *** empty log message *** ---------------------------- revision 1.1 date: 2004/04/05 15:44:24; author: zhee01; state: Exp; branches: 1.1.1; Initial revision ---------------------------- revision 1.1.1.1 date: 2004/04/05 15:44:24; author: zhee01; state: Exp; lines: +0 -0 Branching for 6.4 ---------------------------- revision 1.5.2.2 date: 2005/11/30 23:38:38; author: mism01; state: Exp; lines: +13 -12 IR 451124 - Fixed memory leak issue due to reuse of DBAParameters and DBAColumns objects. ---------------------------- revision 1.5.2.1 date: 2005/11/30 21:21:06; author: mism01; state: Exp; lines: +17 -1 IR 451124 - Fixed memory leak issue due to reuse of DBAParameters and DBAColumns objects. ---------------------------- revision 1.8.4.1 date: 2006/04/03 16:50:10; author: dosa01; state: Exp; lines: +152 -2 FOR IR # 471983 ======================================================================== ===== _______________________________________________ info-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/info-cvs _______________________________________________ info-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/info-cvs _______________________________________________ info-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/info-cvs
