Development Software
 
Forums: » Register « |  User CP |  Games |  Calendar |  Members |  FAQs |  Sitemap |  Support | 
User Name:
Password:
Remember me
Go Back   Dev Shed ForumsWeb Site ManagementDevelopment Software

Reply
Add This Thread To:
  Del.icio.us   Digg   Google   Spurl   Blink   Furl   Simpy   Y! MyWeb 
Thread Tools Search this Thread Rate Thread Display Modes
 
Unread Dev Shed Forums Sponsor:
Get inside! Sample the range of functionality easily built with JMSL Library for Time Series Data Analysis, Heat Maps, Portfolio Optimization, Monte Carlo Simulation, Stock Price Charting and more. Download Now!
  #1  
Old March 28th, 2007, 01:31 PM
guice guice is offline
Contributing User
Dev Shed Newbie (0 - 499 posts)
 
Join Date: Jul 2004
Posts: 209 guice User rank is Corporal (100 - 500 Reputation Level)guice User rank is Corporal (100 - 500 Reputation Level)guice User rank is Corporal (100 - 500 Reputation Level)guice User rank is Corporal (100 - 500 Reputation Level) 
Time spent in forums: 2 Days 16 h 27 m 33 sec
Reputation Power: 7
SVN Question - Branches

My company is currently going through some rethinking of our SVN repositories for our sites.

I'm assisting, indirectly, trying to figure out a good way to work with both styles of development done here.

First style: Web Dev does many minor changes.
Second: Developers do large projects.

The way we have our repository laid out is we have a project root for each site we have. Within that root there's a production folder which contains all files, mimicking the production structure and we have a projects folder were we create individual folders for each project we've done on the site. These folders, too, mimic the directory structure.

Within the project folders, developers copy only files we're editing and then copy them back to the production folder when we're done. Web dev works mostly in the production folder due to their minor changes.

Example copy of an SVN repo:
Code:
root
  |-- production
            |-- htdocs
                    -- Files here.
  |-- projects
           |-- Project 1
                  |-- htdocs
                         |-- only modified files here
           |-- Project 2
                 (ditto)

The object behind that is it allows us to check out the full tree without too many files and it allows us to view, easily, what files were modified for what projects.

The problem we're running into is the lack of the ability to merge change between project folders and into the production folder. I got to thinking about branching, but from what I'm reading, it's just a full copy of the site and "merged" back. That's rather large, especially for a number of our sites.

Is there a way to get the best of both worlds here? Can we use Subversion to create a "minimal" branch using our project folders and be able to merge our project folders into the production folder?

Let me know if you need more information. I'm reading over the SVN Manual, but I don't see any kind of branching that allowed us only to copy over files we're modifying.

Reply With Quote
Reply

Viewing: Dev Shed ForumsWeb Site ManagementDevelopment Software > SVN Question - Branches


Thread Tools  Search this Thread 
Search this Thread:

Advanced Search
Display Modes  Rate This Thread 
Rate This Thread:


Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

vB code is On
Smilies are On
[IMG] code is On
HTML code is Off
View Your Warnings | New Posts | Latest News | Latest Threads | Shoutbox
Forum Jump


Forums: » Register « |  User CP |  Games |  Calendar |  Members |  FAQs |  Sitemap |  Support | 
  
 





© 2003-2008 by Developer Shed. All rights reserved. DS Cluster 2 hosted by Hostway