I have attempted to use VSS's merge facility - but found it doing too much automatically and the manual merging a bit hairy...
For any merging stuff we use BeyondCompare - this is simple to use and reasonably priced. Regards Paul McKenzie Analyst Programmer SMSS Ltd. ----- Original Message ----- From: "David Brennan" <[EMAIL PROTECTED]> To: "NZ Borland Developers Group - Delphi List" <[EMAIL PROTECTED]> Sent: Wednesday, March 31, 2004 10:12 AM Subject: RE: [DUG] Source code control > For what it's worth we have used VSS for years with multiple checkouts > enabled. The merge functionality seems fairly robust. I can't recall any > problems resulting from the automerge. There have been the odd occasions > where a manual merge (which occurs when VSS can't automatically resolve the > differences) caused problems but it's really just a case of being careful in > these situations. > > David. > > > -----Original Message----- > > From: [EMAIL PROTECTED] > > [mailto:[EMAIL PROTECTED] Behalf Of Chris Milham > > Sent: Wednesday, 31 March 2004 9:19 AM > > To: 'NZ Borland Developers Group - Delphi List' > > Subject: RE: [DUG] Source code control > > > > > > CVS (http://www.cvshome.org or http://www.cvsnt.org for Windows), despite > > its shortcomings, is very good. I use it with the TortoiseCVS client > > (http://www.tortoisecvs.org, which integrates with the Windows > > Shell and is > > a very easy to use program. I use it both as a single user and within a > > team. I recommend you get your head around the differences between the CVS > > paradigm (many people can edit the same file at once) and the VSS paradigm > > (only one person can edit a file at a time) before your start using it > > (sorry, I have no good links for explaining further). > > > > HTH > > > > Chris > > > > -- > > Chris Milham BSc BD > > Senior Software Engineer > > EVP Holdings Ltd > > DDI: + 64 9 526 2423 > > Fax: + 64 9 571 0017 > > www.evp.cc > > > > The information contained in this e-mail (and any accompanying > > attachments) > > is confidential and may be legally privileged, intended only for the > > recipient named. Any use, dissemination, distribution or reproduction of > > this message by a recipient other the the addressee/s is > > prohibited. If you > > have received this message in error, please delete the message and any > > attachments and notify the sender immediately. > > > > > -----Original Message----- > > > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] > > > On Behalf Of Eric Tishler > > > Sent: Wednesday, 31 March 2004 8:52 a.m. > > > To: NZ Borland Developers Group - Delphi List > > > Subject: [DUG] Source code control > > > > > > I have a pretty good sized Delphi (6) project that I will need to > > > maintain, including versioning and source code control. Is there a > > > recommended tool out there to use for this purpose? I have Visual Source > > > Safe, but I have only used that for Visual Basic and Visual C++. > > > > > > Does anyone know if it can be used with Delphi. Or, are there any other > > > suggestions? > > > > > > Thanks, > > > > > > Eric > > > > > > Eric Tishler > > > Software Architect > > > Resolute Partners, LLC > > > Phone: 203.271.1122 > > > Fax: 203.271.1460 > > > [EMAIL PROTECTED] > > > > > > > > > > > > _______________________________________________ > > > Delphi mailing list > > > [EMAIL PROTECTED] > > > http://ns3.123.co.nz/mailman/listinfo/delphi > > > > _______________________________________________ > > Delphi mailing list > > [EMAIL PROTECTED] > > http://ns3.123.co.nz/mailman/listinfo/delphi > > > > _______________________________________________ > Delphi mailing list > [EMAIL PROTECTED] > http://ns3.123.co.nz/mailman/listinfo/delphi _______________________________________________ Delphi mailing list [EMAIL PROTECTED] http://ns3.123.co.nz/mailman/listinfo/delphi
