> -----Original Message-----
> From: groups@bcconsultingservices.com
> Hi,
>
> Please forgive this newbie question but I am confused about
> "trunks" and "branches" and, therefore, I am a little unsure
> about how to setup my repositories.
>
> 5) Practically all of my projects share and use that
> framework by referencing its components.
>
> I have a folder setup that works like this. I have a root
> folder called Clients. Underneath that is a folder for each
> client and under each client is a folder tree for each
> project I am working on for them.
Point number one: The contents of the "trunk" should match your single
project layout. Thus if you have a folder on your computer named
"ClientProject", and everything beneath that constitutes what you need
to develop, build, and deploy your project, then "ClientProject" would
be "trunk" in your repository for the main codeline. That's the
simplest point.
> One of the client folders is named for my company and holds
> all of my internal work, including the framework.
You might want to put that framework into a root SVN folder called
"MyFramework" (insert prefered name). In that, you have "trunk", which
contains your main development codeline.
> 1) I presume I should structure the repositories along the
> same line? Is each project a separate repository or is the
> entire clients folder a separate repository?
The structure on your PC might not be the best for the repository, but
it is always a good starting point. You can choose to dump everything
in one repository, or divide up your projects into different ones. It's
up to you. There are pros and cons of each, check the subversion book.
> 2) I need to keep the 7 and 9 versions separate. Since VFP
> uses a lot of binary files, I presume I cannot merge the
> versions if I need to (7 and 9 are very similar) so does that
> mean that they are each separate trunks? Or are they branches?
Since they exist as totally separate projects in the real world now, you
probably want to put the older version into its own place
"MyProjectVer7/trunk", etc., then put the other together in a flexible
way, like "/MyProjectName" (no version numbers) and the
trunk/branches/tags folders beneath.
>
> Yes, I read the SVN manual but I have to admit that applying
> the concepts of branches and trunks to VFP have me confused.
> Any assistance/advise you could offer would be greatly appreciated.
You will start using branches once you have the code in the repository
and need to make changes while keeping another version intact. You will
have what is now v9 as your development trunk. Then, when you're ready
to work on v10, you branch v9 off to keep it isolated. When you need to
work on v11, branch off v10, etc..
If you need to make special changes to v7, branch that, make changes.
If you have differences per client in the code, you will likely have a
branch per client. If you didn't already, try to organize your code so
the differences aren't scattered, and it is easy to merge changes where
they're needed.
>
> Thank you for your time and help,
>
> Menachem Bazian
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
*************************************************************************
This communication, including attachments, is
for the exclusive use of addressee and may contain proprietary,
confidential and/or privileged information. If you are not the intended
recipient, any use, copying, disclosure, dissemination or distribution is
strictly prohibited. If you are not the intended recipient, please notify
the sender immediately by return e-mail, delete this communication and
destroy all copies.
*************************************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Nov 14 19:25:02 2007