Source Code Control
in [Embedded]
|
From: FreeRTOS.org on 7 Nov 2006 17:29 "Steve at fivetrees" <steve(a)NOSPAMTAfivetrees.com> wrote in message news:cKWdnYSs18NwYs3YnZ2dnUVZ8sWdnZ2d(a)pipex.net... > "Darin Johnson" <darin(a)usa.net> wrote in message > news:1162935981.699191.232800(a)b28g2000cwb.googlegroups.com... >> >> I used to use CVS not too long ago, which was ok, but I really really >> hated its automatic merge method, which it would occasionally >> screw up (despite the authors' insistence that this never happens >> unless project members fail to communicate effectively). >> I alway preferred the manual three-way merge: your changes vs >> common ancestor in one pane, their changes vs ancestor in >> another, and the merged stuff in the center pane. CVS gives >> you no convenient way to get this information since it's all >> done deep down using a "diff3" reimplementation. Perforce >> does have a nice merge tool though (choice of manual or automatic). >> >> If Subversion has gotten around this merge headache, then >> I may consider it again in the future. > > I think it has. The merge tool looks pretty good. I've seen it only > briefly, but a colleague was very pleased with it. You can also configure it to use an external merge tool, so can use whatever you are used to or happy with. Regards, Richard. + http://www.FreeRTOS.org + http://www.SafeRTOS.com for Cortex-M3, ARM7, ARM9, HCS12, H8S, MSP430 Microblaze, Coldfire, AVR, x86, 8051, PIC24 & dsPIC
From: Andy Peters on 7 Nov 2006 17:31 Tom Lucas wrote: > IAR reckons they support systems that conform to the Microsoft SCC > interface - does that include Subversion? Also Rowley's Crossworks > supports Microsoft Visual SourceSafe, SourceGear SourceOffSite 3.5.1 and > CVS so would I be right in assuming that Subversion would be OK too? On Windows, I've never seen any advantage to integrating SCC with the development IDE, mainly because TortoiseSVN is so good. On Mac OS X, XCode supports Subversion SCC and it works quite well. -a
From: FreeRTOS.org on 7 Nov 2006 17:32 > We also have experienced database corruption and missing source files. One > chunk of code, fortunately not too vital, went missing for years... > curiously, when I converted the database to Subversion, it showed up > again... How did you convert the database? I am looking for a way of converting some ClearCase VOBs to SVN repositories. Regards, Richard. + http://www.FreeRTOS.org + http://www.SafeRTOS.com for Cortex-M3, ARM7, ARM9, HCS12, H8S, MSP430 Microblaze, Coldfire, AVR, x86, 8051, PIC24 & dsPIC
From: toby on 7 Nov 2006 17:38 FreeRTOS.org wrote: > > We also have experienced database corruption and missing source files. One > > chunk of code, fortunately not too vital, went missing for years... > > curiously, when I converted the database to Subversion, it showed up > > again... > > How did you convert the database? I am looking for a way of converting some > ClearCase VOBs to SVN repositories. There are a bunch of converters on this page, http://subversion.tigris.org/links.html but looks like none for ClearCase (yet :) > > Regards, > Richard. > > + http://www.FreeRTOS.org > + http://www.SafeRTOS.com > for Cortex-M3, ARM7, ARM9, HCS12, H8S, MSP430 > Microblaze, Coldfire, AVR, x86, 8051, PIC24 & dsPIC
From: toby on 7 Nov 2006 17:54
Andy Peters wrote: > Tom Lucas wrote: > > IAR reckons they support systems that conform to the Microsoft SCC > > interface - does that include Subversion? Also Rowley's Crossworks > > supports Microsoft Visual SourceSafe, SourceGear SourceOffSite 3.5.1 and > > CVS so would I be right in assuming that Subversion would be OK too? > > On Windows, I've never seen any advantage to integrating SCC with the > development IDE, mainly because TortoiseSVN is so good. > > On Mac OS X, XCode supports Subversion SCC and it works quite well. And Eclipse has excellent integrated support (Subclipse) on all platforms. > > -a |