I've seen these words a lot around subversion (and I guess general repository) discussions. Myself I have been using svn for my projects the last few years, but I've never grasped the complete concept of these directories. What do they mean? ...
So i have a source tree that i want to clean up in CVS. What a really want is to branch the old stuff off, but never merge in back in. But so i can have an eclipse workspace to access and make some changes if i need to. And then we clean up the main trunk (by removing things we dont need anymore) and keep developing. Then when we hit a...
We have two branches: 1. HEAD - the latest version (AKA Trunc) 2. PROD - the released version When you fix bugs in the released version, which of these do you do: Fix it in PROD, then merge to HEAD Fix it in HEAD, then merge to PROD The advantage of (1) is that this way you absolutely cannot harm the released version by accidentally...
Using TortoiseSVN, I need to take changes I've done in a branch and then merge them with Trunk. I am the only developer on this project, so I know trunk hasn't changed. I am learning SVN so that eventually my team can use it. Basically, I want my trunk to look exactly like the branch. In pre-svn world, I would just copy the files i...
What is a trunk, branch and tag in subversion and what are the best practices to use them. What tools I can use for subversion in Visual Studio 2008? ...
I have merged in Subversion/TortoiseSVN like this a few times: Method A: 1) I change the trunk and commit. 2) I make other changes in a branch and commit. 3) In a working copy from trunk: I merge from the branch using TortoiseSVN's 'Merge a range of revisions'. 4) Then I commit the trunk and delete the branch. However, the Tortoi...
We have a situation where we need to take a tag of our project and make it the new trunk. We have taken the existing trunk and made it into a separate branch. My question is this - once we made a branch of the trunk, can we just delete the trunk and then copy the tag in question into the trunk? Is there a safer way of doing it? Any ...
I'm trying to merge changes from a branch to the trunk, for a single file and a single revision. I'm using VisualSVN as the front-end. So I right-click the file, Visual SVN -> Merge, then select ‘Merge a range of revisions’, then enter the revision number (from the log) and hit Next. Then I click ‘Test Merge’ What I get is the followi...
Hopefully this makes sense: In subversion if I branch a trunk and then fork the branch can I merge changes from the trunk into the forked branch? ...
I'm just starting out using Subversion on a C# project. I am working on this project alone, yet I'm trying to treat is as if I was working in a group for my own learning experience. As I understand it the typical way of working with subversion is to have a trunk folder that will always build. Major changes are then create in new branche...
My team recently decided not to use the "trunk" branch that is typical of most subversion repository layouts. We found that at any given moment there was always a particular branch that functioned in the traditional role that trunk would hold in other repositories. That is, we always have a highest-numbered branch that represents the nex...
Let us say I have a trunk and I create a branch (branch A) of it on Sunday making Revision 10. On Monday I work on both branch A and the trunk (branch A is responsible for Revision 11,12,& 15 while trunk is responsible from 13, 14, & 16). Tuesday I created a new branch (branch B) from the trunk (Revision 17). Wednesday I work on both ...
I just started working on some changes against trunk on an SVN repo, thinking they would be somewhat small. Now, I actually am beginning to realize that I probably should have just started a new branch instead. Rather than making a branch, and then moving each individual piece into it, is there any way to make a new branch and then com...
For instance, suppose I have a branch that I want to update with the new stuff in trunk. I've always just merged trunk into the new branch, but I came across a somewhat different process that Divmod uses. Does divmod have some kind of special requirement to do branching like this, or have I been doing it wrong all along? ...
I have a trunk (A) and two branches (B and C). When I merge A with C its OK, after I merge A with B, the previous C its overwriten and my trunk don't have the C changes. What I want is A + B + C into trunk after merges. Edited for more explanation: In trunk I have 3 files: "FILE 1", "FILE 2" and "FILE 3"; I create a branch from trunk...
I have a question as to the proper use of the trunk and branches for my SVN projects. For my team's project we create 3 major releases each year and sometimes a minor release or two in between. At any point in time we may have active development on 2 or even 3 releases. We have been doing all development in branches with a structure like...
Is it possible to change the tag on a branch to make it replace the trunk without merging? Update: I solved it, I also see now that it doesnt matter trunk is nothing more than a name, you can close it and use another. ...
Hi, With SVN is there an easy way to get a list of all the commits between a tag (usually the most recent) and the current trunk, so you can see what (if anything) has changed? Likewise, can you do the same to compare the commits between two tags. Cheers, Jack ...
Hi there! I'm currently working in a web application development. Our company methodology is to work on the project trunk for as long as possible and switch to the branches only when necessary. However, in order to guarantee the success of a recent deploy, I have worked directly on the client specific branch. I would like to know how c...
I probably just haven't thought this through, or perhaps I'm simply unaware of an already existing option in Subversion (I'm certainly no expert). I'm just wondering, if I've created a branch to start working on some new feature, if there's an easier way to keep the branch up to date with the trunk's most recent revisions without having...