|
[Date Prev] [Date Next] [Thread Prev] [Thread Next] [Date Index] [Thread Index]
1) Yup. That's pretty much it.
2) If it's versioned, svn externals. If not, svn ignore.
--
Doug Stewart
On Sep 14, 2009, at 6:36 PM, Eric <eric@lucii.org> wrote:
> I have a question for the SVN users here:
>
> Say that I have a web site: /var/www/mainsite
> I want to keep it in svn and work on the development (working) copy in
> /var/www/mainsite-devl
>
> I've imported like this:
>
> svn import mainsite file:///home/svn/mainsite/trunk/ -m "Initial
> import"
>
> Now I'll pull out a working copy in the mainsite-devl directory and
> work on it.
>
> After the devl branch is ready how do I get it to be in the mainsite?
> I am presuming that I:
> check in the devl branch
> merge that branch with the trunk
> do an 'svn update' in the /var/www/mainsite directory
>
> Is that the way it works?
>
> Also, there is one configuration file that has to remain different
> between the
> mainsite-devl and mainsite code. How do I tell svn to leave that
> alone?
>
> (ok, technically that makes it two questions.)
>
> TIA
>
>
> Eric
> --
> # Eric Lucas
> #
> # "Oh, I have slipped the surly bond of earth
> # And danced the skies on laughter-silvered wings...
> # -- John Gillespie Magee Jr
> ___________________________________________________________________________
> Philadelphia Linux Users Group -- http://www.phillylinux.org
> Announcements - http://lists.phillylinux.org/mailman/listinfo/plug-announce
> General Discussion -- http://lists.phillylinux.org/mailman/listinfo/plug
___________________________________________________________________________
Philadelphia Linux Users Group -- http://www.phillylinux.org
Announcements - http://lists.phillylinux.org/mailman/listinfo/plug-announce
General Discussion -- http://lists.phillylinux.org/mailman/listinfo/plug
|
|