Stack Overflow
Stack Overflow

Questions tagged [trunk]

Trunk is a main branch recommended by Subversion, but you are in no way forced to create this.

Detailed info: https://en.wikipedia.org/wiki/Apache_Subversion#Subversion_tags_and_branches

Stack Overflow post on this: What do "branch", "tag" and "trunk" mean in Subversion repositories?

170 questions
11
votes
4 answers

Svn merging trunk and branches

I have a huge project. I need to make a branch - this will be version 2 of the project, but I also need to keep the trunk and change it in parallel with the branch 1 as bug fix to the version 1. I need to merge bug fixes from the trunk to the branch…
Darko Petreski
  • 111
  • 1
  • 3
9
votes
1 answer

Can I (and how to) apply a patch created from trunk to a branch?

I was working on the trunk recently and the changed I did I thought others might need them so I created a patch just before committing. Now a fellow dev who was working on a branch (which comes from the trunk a couple of weeks back) needs those…
Sébastien Richer
  • 1,642
  • 2
  • 17
  • 38
7
votes
2 answers

Merging from branch to trunk with 'Merge range of revisions'

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…
Ole Lynge
  • 4,457
  • 8
  • 43
  • 57
7
votes
2 answers

Bzr: Create a shared repository from an existing stand-alone repository

I have been using Bzr for version control of my project over the last few months. I am the sole developer, and currently I just have everything in a single local project directory, to which I commit and which I sync to DriveHQ. I now have some…
ChrisM
  • 2,128
  • 1
  • 23
  • 41
7
votes
3 answers

Is there any way to commit changes that I've made to my SVN checkout of trunk to a branch instead?

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…
Jason Baker
  • 192,085
  • 135
  • 376
  • 510
6
votes
5 answers

Changing the Directory Structure in Subversion

How do I create a branch in subversion that is deeper' than just the 'branches' directory? I have the standard trunk, tags and branches structure and I want to create a branch that is several directories deeper than the 'branches' tag. Using the…
kaybenleroll
  • 16,794
  • 16
  • 54
  • 66
6
votes
4 answers

Create SVN branch from changes in trunk

I'm in a stupid situation: I have done some changes in a working copy of the TRUNK. Since the changes have not been tested, I'd like to transfer all the changes to a branch. According to the manual of Tortoise, Switch will lose all my modifications.…
John
  • 63
  • 1
  • 4
5
votes
1 answer

Can I keep merging repeatedly from a branch to trunk with Subversion merge tracking?

We released version 1.0 and continue developing 2.0 in trunk. We created branches/1.0 for bug fixes related to the released version. Plan is: 2.0 development continues in trunk/ trunk/ contains new features that are not to be merged into…
user449236
  • 513
  • 1
  • 4
  • 6
5
votes
1 answer

How can I sync my custom CodePlex Mercurial fork against the main trunk?

I've made a fork of some codeplex project. Done some extra code, etc and have even pulled my custom code into the source control repo. In those few weeks and months since i was working on my own fork, their main trunk has been updated. how can i…
Pure.Krome
  • 84,693
  • 113
  • 396
  • 647
5
votes
1 answer

Reorganise svn folder structure Tortoise

I have an SVN repository named 'Solution' (contains many projects) created without the default trunk, branch etc structure. I'd like to move this to the recommended structure. I have created the new folder structure on the server where 'Team' is the…
Rufyan
  • 305
  • 4
  • 15
4
votes
1 answer

SVN authz, path-based authentication on trunk / branch

I use authz files to restrict access to a svn server (projA, projB). I would like to use the same restrictions for the trunk and the branches. Is there a nice way of doing it, instead of copy/pasting the configurations: [/]
* =…
David
  • 41
  • 2
4
votes
1 answer

how to change the trunk name of cocoapods after pod trunk register?

When I use cocoapods trunk register, I used a random name, but now I want make it more readable. But there is no way to change it... Event I use "pod trunk register email 'new name'" again. it doesn't works. :(
Haihan Wang
  • 41
  • 3
4
votes
2 answers

Branch a version in CVS

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…
mark
4
votes
1 answer

svn create trunk and branches

I used Visual SVN Manager to create a repository, but I didn't create /trunk /branches and /tags at first. Now, I NEED to add these since the project has grown up ==> branching and merging is essential! What is the best way to do so ?
firas
  • 1,463
  • 4
  • 19
  • 42
4
votes
1 answer

Subversion 1.7 vs 1.8 relative (^) symbol oddities

I have an external Subversion repo accessed from two separate machines, one machine is using svn v1.7.9 and the other is using v1.8.3. From v1.7.9 I can use the svn ls command with the relative (^) symbol and it works as expected (from the root of…
chattsm
  • 4,651
  • 5
  • 19
  • 20
1
2
3
…
11 12