<?xml version="1.0" encoding="utf-8"?>
<feed xmlns="http://www.w3.org/2005/Atom">
	<title type="html"><![CDATA[Approximatrix Forums — Version Control]]></title>
	<link rel="self" href="http://forums.approximatrix.com/extern.php?action=feed&amp;tid=363&amp;type=atom" />
	<updated>2014-08-10T09:16:20Z</updated>
	<generator>PunBB</generator>
	<id>http://forums.approximatrix.com/viewtopic.php?id=363</id>
		<entry>
			<title type="html"><![CDATA[Re: Version Control]]></title>
			<link rel="alternate" href="http://forums.approximatrix.com/viewtopic.php?pid=1481#p1481" />
			<content type="html"><![CDATA[<p>If you are using TortoiseSVN it comes with Subversion, so you don&#039;t need to install Subversion separately.</p><p>When you install TortoiseSVN you need to tick the &quot;command line tools&quot; option if you want to use the command line as well as the GUI.</p><p>Its fine to use SourceForge but initially you should first &quot;learn&quot; the basics using a simple filesystem repository.</p><p>Some tips:</p><p>- As you are programming in linux and windows, learn how to control the line endings in the repository and in your working copies using svn:eol-style= native.</p><p>&nbsp; &nbsp;see</p><p>&nbsp; &nbsp;<a href="http://svnbook.red-bean.com/en/1.1/ch07s02.html#svn-ch-7-sect-2.3.5">http://svnbook.red-bean.com/en/1.1/ch07 … sect-2.3.5</a></p><p>- learn how to include the current version number as a comment in each file (if you want).</p><p>- Don&#039;t rush things, especially when you get a conflict message when your &quot;working base&quot; becomes out of date due to other users&#039; commits. (The &quot;other&quot; user could be someone else or you working on your other operating system).</p><p>- Do use sensible commit messages.</p>]]></content>
			<author>
				<name><![CDATA[davidb]]></name>
				<uri>http://forums.approximatrix.com/profile.php?id=3463</uri>
			</author>
			<updated>2014-08-10T09:16:20Z</updated>
			<id>http://forums.approximatrix.com/viewtopic.php?pid=1481#p1481</id>
		</entry>
		<entry>
			<title type="html"><![CDATA[Re: Version Control]]></title>
			<link rel="alternate" href="http://forums.approximatrix.com/viewtopic.php?pid=1480#p1480" />
			<content type="html"><![CDATA[<p>Thanks to you both.</p><p>I&#039;ve installed Subversion and TortoiseSVN, and I&#039;m learning how to use them.</p><p>I am going to try to use SourceForge for my repository.<br />I don&#039;t yet know how to use that either.</p><p>Does all the above seem sensible?<br />I&#039;ll need access to my repository using Linux on one laptop and Windows on another.</p><p>I&#039;ll appreciate any useful tips.<br />&quot;RtFM&quot; I know already!<br />---<br />J.</p>]]></content>
			<author>
				<name><![CDATA[JohnWasilewski]]></name>
				<uri>http://forums.approximatrix.com/profile.php?id=102</uri>
			</author>
			<updated>2014-08-09T20:50:53Z</updated>
			<id>http://forums.approximatrix.com/viewtopic.php?pid=1480#p1480</id>
		</entry>
		<entry>
			<title type="html"><![CDATA[Re: Version Control]]></title>
			<link rel="alternate" href="http://forums.approximatrix.com/viewtopic.php?pid=1479#p1479" />
			<content type="html"><![CDATA[<p>I have used both Subversion and Git. I prefer Subversion because it is easier to use.</p><p>I use the excellent TortoiseSVN client for Windows and I use the command line in linux.</p><p><a href="http://tortoisesvn.net/">http://tortoisesvn.net/</a></p><p>It comes with TortoiseDiff for looking at file differences (between versions) but also allows you to use other tools if you wish.</p><p>In the office the repository is stored on a linux workstation which runs a server program to allow access to the repository from the client machines (Windows PCs and linux workstations).</p><p>At home, I run a Subversion server directly on my Synology NAS drive on my local LAN so I can access my repositories from any computer on the network (there are 3) and from windows and linux. I am the only programmer using these repositories but I still use version control to help track the changes I make.</p><p>There is also a Git server for the NAS and TortoiseGit but I haven&#039;t tried them.</p><p>I would say stick with Subversion unless you need to work with an existing project that is using Git.</p>]]></content>
			<author>
				<name><![CDATA[davidb]]></name>
				<uri>http://forums.approximatrix.com/profile.php?id=3463</uri>
			</author>
			<updated>2014-08-09T10:20:25Z</updated>
			<id>http://forums.approximatrix.com/viewtopic.php?pid=1479#p1479</id>
		</entry>
		<entry>
			<title type="html"><![CDATA[Re: Version Control]]></title>
			<link rel="alternate" href="http://forums.approximatrix.com/viewtopic.php?pid=1478#p1478" />
			<content type="html"><![CDATA[<p>John,</p><p>I&#039;ve used quite a few over the years.&nbsp; &nbsp;I&#039;ve basically settled on using two, either Subversion or Git.&nbsp; Subversion is arguably the simpler of the two.&nbsp; On single-developer projects it works out nicely because no &quot;server&quot; is actually necessary (although Git&nbsp; doesn&#039;t need one either, but&nbsp; anyway...).&nbsp; &nbsp;Subversion is simple because it basically tracks commits to your central repository (this can be a directory on your system, not necessarily a server) by number in sequential order.&nbsp; Additionally, on Windows, TortoiseSVN is a very powerful Subversion client that can eliminate any need for command-line use.</p><p>Git is a form of distributed version control, but, for a single developer, this distinction might not be overly important.&nbsp; Git is, in my opinion, more powerful because &quot;branching&quot; the code is drastically simpler.&nbsp; Branching is central to the Git workflow.&nbsp; Basically, you&#039;d create a local branch, make your changes, merge them back&nbsp; to the &quot;master&quot; branch, and commit them.&nbsp; Git&#039;s learning curve is a bit steeper than Subversion, so it might be better to start with Subversion.&nbsp; Additionally, Git&#039;s tracking of your code via hashes rather than a simple, sequential number can be intimidating at first.&nbsp; </p><p>There are some great books available for free for both these solutions:</p><p>Subversion: <a href="http://svnbook.red-bean.com/">Version Control with Subversion</a></p><p>Git: <a href="http://git-scm.com/book">Pro Git</a></p><p>I wouldn&#039;t suggest any other version control systems at this time.&nbsp; Subversion was designed to be a &quot;better&quot; CVS, so I would suggest avoiding CVS.&nbsp; Mercurial&nbsp; is often offered as an alternative to Git, but I&#039;ve never been a particular fan of it.&nbsp; There are a few proprietary ones, but I think maybe Perforce is the only one that I&#039;ve actually enjoyed using.</p><p>If it makes any difference, Simply Fortran itself is developed using Git as source control, but it had previously used Subversion.</p><p>Simply Fortran doesn&#039;t directly integrate any version control system, incidentally, because we&#039;ve never had any users request that feature.</p>]]></content>
			<author>
				<name><![CDATA[jeff]]></name>
				<uri>http://forums.approximatrix.com/profile.php?id=2</uri>
			</author>
			<updated>2014-08-08T18:52:28Z</updated>
			<id>http://forums.approximatrix.com/viewtopic.php?pid=1478#p1478</id>
		</entry>
		<entry>
			<title type="html"><![CDATA[Version Control]]></title>
			<link rel="alternate" href="http://forums.approximatrix.com/viewtopic.php?pid=1477#p1477" />
			<content type="html"><![CDATA[<p>Please may I have recommendations to help me select which version control system I should learn to use?</p><p>I don&#039;t have enough spare time to install several of them, learn how to use each one (which looks like quite a lot to assimilate), then try each one for a few weeks.&nbsp; I&#039;d therefore really appreciate a very brief list from contributors to this forum, of the best known VCSs, and what their pluses and minuses seem to be.&nbsp; I plan to rely on what I read here to help me choose what will work best for my particular purposes.<br />----<br />John</p>]]></content>
			<author>
				<name><![CDATA[JohnWasilewski]]></name>
				<uri>http://forums.approximatrix.com/profile.php?id=102</uri>
			</author>
			<updated>2014-08-08T18:18:53Z</updated>
			<id>http://forums.approximatrix.com/viewtopic.php?pid=1477#p1477</id>
		</entry>
</feed>
