<HTML xmlns="http://www.w3.org/TR/REC-html40" xmlns:v =
"urn:schemas-microsoft-com:vml" xmlns:o =
"urn:schemas-microsoft-com:office:office" xmlns:w =
"urn:schemas-microsoft-com:office:word" xmlns:dt =
"uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:m =
"http://schemas.microsoft.com/office/2004/12/omml"><HEAD>
<META content="text/html; charset=utf-8" http-equiv=Content-Type>
<META name=Generator content="Microsoft Word 14 (filtered medium)">
<STYLE><!--
/* Font Definitions */
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:Tahoma;
panose-1:2 11 6 4 3 5 4 4 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman","serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
p
{mso-style-priority:99;
mso-margin-top-alt:auto;
margin-right:0cm;
mso-margin-bottom-alt:auto;
margin-left:0cm;
font-size:12.0pt;
font-family:"Times New Roman","serif";}
span.EmailStyle18
{mso-style-type:personal-reply;
font-family:"Calibri","sans-serif";
color:#1F497D;}
..MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri","sans-serif";
mso-fareast-language:EN-US;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 72.0pt 72.0pt 72.0pt;}
div.WordSection1
{page:WordSection1;}
--></STYLE>
</HEAD>
<BODY lang=EN-NZ dir=ltr link=blue vLink=purple>
<DIV dir=ltr>
<DIV style="FONT-SIZE: 12pt; FONT-FAMILY: 'Calibri'; COLOR: #000000">
<DIV>Related – anyone have experience in keeping a repository (SVN or GIT)
encrypted? I been wondering about keeping it on a Google Drive,
without the folks at Google, their NSA buddies and their Chinese rivals being
able steal my clever ideas.</DIV>
<DIV> </DIV>
<DIV>(I would think there is nothing to interest them there, but the NSA policy
internally is it “Sniff it All, Store it All”).</DIV>
<DIV
style='FONT-SIZE: small; TEXT-DECORATION: none; FONT-FAMILY: "Calibri"; FONT-WEIGHT: normal; COLOR: #000000; FONT-STYLE: normal; DISPLAY: inline'>
<DIV style="FONT: 10pt tahoma">
<DIV> </DIV>
<DIV style="BACKGROUND: #f5f5f5">
<DIV style="font-color: black"><B>From:</B> <A title=Conor_Boyd@trimble.com
href="mailto:Conor_Boyd@trimble.com">Conor Boyd</A> </DIV>
<DIV><B>Sent:</B> Thursday, May 29, 2014 10:42 AM</DIV>
<DIV><B>To:</B> <A title=delphi@listserver.123.net.nz
href="mailto:delphi@listserver.123.net.nz">NZ Borland Developers Group - Delphi
List</A> </DIV>
<DIV><B>Subject:</B> Re: [DUG] Delphi & Git</DIV></DIV></DIV>
<DIV> </DIV></DIV>
<DIV
style='FONT-SIZE: small; TEXT-DECORATION: none; FONT-FAMILY: "Calibri"; FONT-WEIGHT: normal; COLOR: #000000; FONT-STYLE: normal; DISPLAY: inline'>
<DIV class=WordSection1>
<P class=MsoNormal><SPAN
style='FONT-SIZE: 11pt; FONT-FAMILY: "Calibri","sans-serif"; COLOR: #1f497d'>WRT
keeping DFMs as text to facilitate diffing, list members might not be aware of
<A href="http://www.scootersoftware.com/">Beyond Compare</A>’s ability to diff
binary DFMs. Once you configure something like TortoiseSVN to use BC as
your diff tool, it significantly reduces the issue of binary vs text DFMs, among
all the other niceties in BC3 such as 3-way merging, etc.<o:p></o:p></SPAN></P>
<P class=MsoNormal><SPAN
style='FONT-SIZE: 11pt; FONT-FAMILY: "Calibri","sans-serif"; COLOR: #1f497d'><o:p></o:p></SPAN> </P>
<P class=MsoNormal><SPAN
style='FONT-SIZE: 11pt; FONT-FAMILY: "Calibri","sans-serif"; COLOR: #1f497d'>I’m
not particularly advocating keeping DFMs as binary, just throwing this out there
for those who may not be aware of it.<o:p></o:p></SPAN></P>
<P class=MsoNormal><SPAN
style='FONT-SIZE: 11pt; FONT-FAMILY: "Calibri","sans-serif"; COLOR: #1f497d'><o:p></o:p></SPAN> </P>
<P class=MsoNormal><SPAN
style='FONT-SIZE: 11pt; FONT-FAMILY: "Calibri","sans-serif"; COLOR: #1f497d'>While
I haven’t used Git, I concur with Jolyon’s initial comment that I don’t think
there’s anything specific to keep in mind about using Delphi with any one
particular VCS system.<o:p></o:p></SPAN></P>
<P class=MsoNormal><SPAN
style='FONT-SIZE: 11pt; FONT-FAMILY: "Calibri","sans-serif"; COLOR: #1f497d'><o:p></o:p></SPAN> </P>
<P class=MsoNormal><B><SPAN lang=EN-US
style='FONT-SIZE: 10pt; FONT-FAMILY: "Tahoma","sans-serif"'>From:</SPAN></B><SPAN
lang=EN-US style='FONT-SIZE: 10pt; FONT-FAMILY: "Tahoma","sans-serif"'>
delphi-bounces@listserver.123.net.nz
[mailto:delphi-bounces@listserver.123.net.nz] <B>On Behalf Of </B>Jolyon
Smith<BR><B>Sent:</B> Thursday, 29 May 2014 10:20 a.m.<BR><B>To:</B> NZ Borland
Developers Group - Delphi List<BR><B>Subject:</B> Re: [DUG] Delphi &
Git<o:p></o:p></SPAN></P>
<P class=MsoNormal><o:p></o:p> </P>
<DIV>
<P class=MsoNormal>There is nothing particularly noteworthy about using Delphi
with Git that isn't also applicable when using Delphi with any other version
control system, such as keeping keeping DFM files in text form rather than
binary, to facilitate diffíng etc etc. Other than that it is simply a
question of the differences in how you use Git as opposed to those other systems
(e.g. in establishing files or filetypes to be ignored for the purposes of
versioning etc).<BR><BR><o:p></o:p></P></DIV>
<DIV>
<P class=MsoNormal><o:p></o:p> </P></DIV></DIV>
<P>
<HR>
_______________________________________________<BR>NZ Borland Developers Group -
Delphi mailing list<BR>Post: delphi@listserver.123.net.nz<BR>Admin:
http://delphi.org.nz/mailman/listinfo/delphi<BR>Unsubscribe: send an email to
delphi-request@listserver.123.net.nz with Subject:
unsubscribe</DIV></DIV></DIV></BODY></HTML>