You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Yves Dorfsman <yv...@zioup.com> on 2009/01/21 14:49:08 UTC

branches / tags / trunk

I'd like to hear from people with a large user base who switched from 
another VCS to subversion, and how their users coped with the branches and 
tags being in a different directory, the fact that they can't "switch" the 
current directory to a different tag or branch, the problem of forgetting to 
add "trunk" when checking out and getting GiB of files instead of MiB, etc...

Is there any way to hide this from the users, and make svn act more like CVS 
or Mercurial ?

Thanks.

-- 
Yves.
http://www.sollers.ca/blog/

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1041261

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].

Re: branches / tags / trunk

Posted by Ryan Schmidt <su...@ryandesign.com>.
On Jan 21, 2009, at 08:49, Yves Dorfsman wrote:

> I'd like to hear from people with a large user base who switched from
> another VCS to subversion, and how their users coped with the  
> branches and
> tags being in a different directory, the fact that they can't  
> "switch" the
> current directory to a different tag or branch, the problem of  
> forgetting to
> add "trunk" when checking out and getting GiB of files instead of  
> MiB, etc...

As others have mentioned, of course you can switch the working copy  
between the trunk, the branches and tags, using "svn switch."

You can prevent people from checking out the entire repository (and  
forcing them to check out either the trunk or a branch or tag they're  
interested in) by serving the repository with apache2 instead of  
svnserve and installing mod_dontdothat:

http://svn.collab.net/repos/svn/trunk/contrib/server-side/ 
mod_dontdothat/

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1042963

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].

Re: branches / tags / trunk

Posted by JeremyP <je...@jeremyp.net>.
On 21 Jan 2009, at 14:49, Yves Dorfsman wrote:

> how their users coped with the branches and
> tags being in a different directory, the fact that they can't  
> "switch" the
> current directory to a different tag or branch,

See option 1 below:

monica:~ jeremyp$ svn help switch
switch (sw): Update the working copy to a different URL.
usage: 1. switch URL [PATH]
        2. switch --relocate FROM TO [PATH...]

   1. Update the working copy to mirror a new URL within the repository.
      This behaviour is similar to 'svn update', and is the way to
      move a working copy to a branch or tag within the same repository.

   2. <<snip>>

>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1041261
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org 
> ].

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1041304

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].

RE: branches / tags / trunk

Posted by Bob Archer <Bo...@amsi.com>.
> I'd like to hear from people with a large user base who switched from
> another VCS to subversion, and how their users coped with the branches
and
> tags being in a different directory, the fact that they can't "switch"
the
> current directory to a different tag or branch, the problem of
forgetting
> to
> add "trunk" when checking out and getting GiB of files instead of MiB,
> etc...

We, fairly recently moved from PVCS Version Manager to svn. It took a
while for people to get used to it. But, the biggest adjustment was
going from get (w/lock) - edit - checking to checkout - edit - commit.
They didn't trust svn to not loose their stuff when they did updates.
They didn't trust merging of two users edits would ever possible work. 

We also have our QA people using it to. To check in silktest scripts.
And doc is not using it to check in doc assets which were previously
just an unversioned directory on the server.

Frankly the trunk / branch / tag directories made a lot more sense to
all of us than the file based labels and branching used in PVCS. As a
matter of fact, we never used branching in PVCS because it just seemed
too complicated.

Also, we love the increased performance. Putting a label on a project in
PVCS could take 10minutes or more, even on our smaller projects
(although the newer client/server versions helped). Creating a tag with
svn takes seconds. 

BTW: You CAN switch a WC to point to a different branch if you want.
But, we tend to check out branches separately from trunk in order to
easily keep it straight what version we are working on rather than
having to check the WC info all the time. 

What they do have trouble with has been merging. Svn 1.5 has helped this
quite a bit. However, it is still a bit difficult because we do have
some binary assets that can't be merged. So, if there are edits in trunk
and branch to one of these a manual edit needs to happen to apply the
changes in one folder to the other, rather than a simple merge. 

But, I am considering changing our work flow to match the svn souce code
methods. Where they branch for release and they don't do development in
the release branch but only merge in selectively from trunk as issues
are fixed or for hotfixes or whatever. I think this would solve the
binary file issue since there would only be one path (trunk) where
changes are actually made. I'm not sure how this will work for major
refactorings though.

> to
> add "trunk" when checking out and getting GiB of files instead of MiB,
> etc...

You don't have to use the word trunk. That is just a convention. You
could change the name. Training and experience is your friend. 

> Is there any way to hide this from the users, and make svn act more
like
> CVS
> or Mercurial ?

I really don't think hiding this is the best idea. Train your users on
what is happening. Have them read the concepts and process sections of
the svn book. 

Hth,
BOb

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1041283

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].


RE: branches / tags / trunk

Posted by Edward Ned Harvey <ed...@patni.com>.
> I'd like to hear from people with a large user base who
> switched from another VCS to subversion, and how their users
> coped with the branches and tags being in a different
> directory, the fact that they can't "switch" the current
> directory to a different tag or branch, the problem of
> forgetting to add "trunk" when checking out and getting GiB
> of files instead of MiB, etc...
>
> Is there any way to hide this from the users, and make svn
> act more like CVS or Mercurial ?

I don't know how people did/do things with CVS or Mercurial, but I can say this:

With SVN, the engineers plans often change, and wherever they originally thought they should have a trunk/branch/tag often moves at a later date.  It would be a pain to actually move it, so we never do.  It's never been a problem.

In fewer words:  I don't think it really matters if you forget to create trunk.  I also don't think it really matters if you create an extra trunk.

As long as you understand how to use "svn cp" and "svn switch" you can solve any problem you encounter.

This e-mail message may contain proprietary, confidential or legally privileged information for the sole use of the person or entity to whom this message was originally addressed. Any review, e-transmission dissemination or other use of or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you have received this e-mail in error kindly delete  this e-mail from your records. If it appears that this mail has been forwarded to you without proper authority, please notify us immediately at netadmin@patni.com and delete this mail.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1043521

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].