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><div class="gmail_quote">On Wed, Apr 28, 2010 at 9:58 AM, Brian Vuyk <span dir="ltr"><<a href="mailto:brian@brianvuyk.com">brian@brianvuyk.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<div bgcolor="#ffffff" text="#000000">
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" target="_blank">http://svnbook.red-bean.com/en/1.1/ch04.html</a><br><font color="#888888">
<br>
Brian</font><div><div></div><div class="h5"><br>
<br>
nan wich wrote:
<blockquote type="cite">
<div style="font-family: arial,helvetica,sans-serif; font-size: 14pt; color: rgb(127, 0, 63);">
<div>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.</div>
<div> </div>
<div>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.</div>
<div> </div>
<div>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>
</div>
<p><font color="#ff007f" face="bookman old style, new york, times, serif" size="4"><i><b>Nancy
E. Wichmann, PMP</b></i></font></p>
<p><font face="arial, helvetica, sans-serif">Injustice anywhere is a
threat to justice everywhere. -- Dr. Martin L. King, Jr.</font></p>
</div>
</blockquote>
<br>
</div></div></div>
</blockquote></div><br>