<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
<META NAME="GENERATOR" CONTENT="GtkHTML/3.28.1">
</HEAD>
<BODY>
I completely agree with Justin, and can't recommend Git enough.<BR>
<BR>
Especially when a lot of different features are developed at the same time. And it's very easy to check how different features work together by creating new branch and than merging features in it. It's so fast and easy, that I wonder how I ever coded without it...<BR>
<BR>
On Wed, 2010-04-28 at 10:16 -0500, Justin Ellison wrote:<BR>
<BLOCKQUOTE TYPE=CITE>
Brian is absolutely right. I'm going to try and add something without starting a flame war.<BR>
<BR>
This is the exact purpose that Git was designed for. While SVN can do branching and merging, it's slow and often a manual process. With Git, it's so fast that I often think that something broke.<BR>
<BR>
You mentioned that you do contrib work - D.O is migrating to git as well, so learning git now will have real value to you later.<BR>
<BR>
<A HREF="http://book.git-scm.com/">http://book.git-scm.com/</A><BR>
<BR>
Git does have a learning curve to it, so if you don't have the time to pick it up, you can accomplish the same thing in SVN. It may leave a sour taste - I know it does for me.<BR>
<BR>
Justin<BR>
<BR>
</BLOCKQUOTE>
<BLOCKQUOTE TYPE=CITE>
On Wed, Apr 28, 2010 at 9:58 AM, Brian Vuyk <<A HREF="mailto:brian@brianvuyk.com">brian@brianvuyk.com</A>> wrote:
</BLOCKQUOTE>
<BLOCKQUOTE TYPE=CITE>
<BLOCKQUOTE>
Create branches for each specific task /feature you are trying to implement. <BR>
<BR>
When a feature is implemented, merge that branch for it into the main development branch. In the past, I've generally kept a 'production' branch which mirrors what is on the production site. New features (each from their own branch) are merged to that branch as they are completed, and tested before production is updated from that branch. Finally, it helps to keep a 'misc' branch for small tasks that may not require their own branch.<BR>
<BR>
It sounds like a lot of work, but it becomes second nature after a while. I would suggest reading Chapter 4 of the SVN book: <A HREF="http://svnbook.red-bean.com/en/1.1/ch04.html">http://svnbook.red-bean.com/en/1.1/ch04.html</A><BR>
<BR>
<FONT COLOR="#888888">Brian</FONT>
</BLOCKQUOTE>
</BLOCKQUOTE>
<BLOCKQUOTE TYPE=CITE>
<BLOCKQUOTE>
<BR>
</BLOCKQUOTE>
</BLOCKQUOTE>
<BLOCKQUOTE TYPE=CITE>
<BLOCKQUOTE>
<BR>
<BR>
nan wich wrote:
</BLOCKQUOTE>
</BLOCKQUOTE>
<BLOCKQUOTE TYPE=CITE>
<BLOCKQUOTE>
<BLOCKQUOTE TYPE=CITE>
At my current location, I have developed a major site-specific module (well over 100K). I have already split the admin, pages, and blocks out into separate files. I have largely done this on the same model as I use for my DO contribs.
</BLOCKQUOTE>
</BLOCKQUOTE>
</BLOCKQUOTE>
<BLOCKQUOTE TYPE=CITE>
<BLOCKQUOTE>
<BLOCKQUOTE TYPE=CITE>
</BLOCKQUOTE>
</BLOCKQUOTE>
</BLOCKQUOTE>
<BLOCKQUOTE TYPE=CITE>
<BLOCKQUOTE>
<BLOCKQUOTE TYPE=CITE>
At any given time I may have four or five changes in place at various stages of testing, and working on the next change. The problem is that the powers-that-be occasionally want one change moved to production quickly. I can't do that without potentially moving untested changes too.
</BLOCKQUOTE>
</BLOCKQUOTE>
</BLOCKQUOTE>
<BLOCKQUOTE TYPE=CITE>
<BLOCKQUOTE>
<BLOCKQUOTE TYPE=CITE>
</BLOCKQUOTE>
</BLOCKQUOTE>
</BLOCKQUOTE>
<BLOCKQUOTE TYPE=CITE>
<BLOCKQUOTE>
<BLOCKQUOTE TYPE=CITE>
So I'm looking for ways that others get around this situation. Certainly I can move various smaller pieces into include files; this is not a major problem as we use eAccelerator to cache all the modules any way. Is that the best way or only way? We do have SVN available.<BR>
</BLOCKQUOTE>
</BLOCKQUOTE>
</BLOCKQUOTE>
<BLOCKQUOTE TYPE=CITE>
<BLOCKQUOTE>
<BLOCKQUOTE TYPE=CITE>
<B><I><FONT SIZE="4"><FONT COLOR="#ff007f">Nancy E. Wichmann, PMP</FONT></FONT></I></B><BR>
<BR>
Injustice anywhere is a threat to justice everywhere. -- Dr. Martin L. King, Jr.<BR>
<BR>
<BR>
</BLOCKQUOTE>
</BLOCKQUOTE>
</BLOCKQUOTE>
<BLOCKQUOTE TYPE=CITE>
<BLOCKQUOTE>
<BR>
<BR>
</BLOCKQUOTE>
</BLOCKQUOTE>
<BLOCKQUOTE TYPE=CITE>
<BR>
</BLOCKQUOTE>
<BR>
<BR>
<TABLE CELLSPACING="0" CELLPADDING="0" WIDTH="100%">
<TR>
<TD>
<BR>
-- <BR>
Nikola Kotur<BR>
<A HREF="http://nultibitovi.net">http://nultibitovi.net</A><BR>
<BR>
<BR>
</TD>
</TR>
</TABLE>
</BODY>
</HTML>