Trunk is a main branch recommended by Subversion, but you are in no way forced to create it.
Trunk is a main branch recommended by Subversion, but you are in no way forced to create it.
Synonymous trunk
Questions tagged [svn-trunk]
22 questions
15
votes
5 answers
SVN Revert Trunk, remove a revision as if it never existed?
Is it possible in the svn server to remove a revision as if it never existed?
So we have the following revisions:
1004 // Commit of some bogus code that broke the build and was just wrong
1003 // Change 1.2
1002 // Change 1.1
1001
1000 *** Initial…
Mantisimo
- 4,203
- 5
- 37
- 55
3
votes
1 answer
How to move a branch in SVN to trunk?
how can I move a SVN branch into trunk ?
The problem I face is, that if I do a move command in SVN (command line or inside Eclipse) I only can move the branch folder into trunk, resulting to have that folder in trunk. But I want to have all content…
Emerson
- 1,327
- 2
- 15
- 24
3
votes
1 answer
SVN - Is creating branch from branch from branch on and on wrong?
Situation:
I have seen a practice where SVN branches are created from branches and keep on going. For example: Branch1 was created from TRUNK; Branch2 from Branch1; etc. See below to get an idea:
....goes on and on.......Branch4--from-->…
sivv
- 31
- 2
3
votes
1 answer
Can git svn init handle sibling directories of trunk/branches/tags that should be part of base checkout
The macports svn repository looks like this:
branches/
contrib/
distfiles/
downloads/
tags/
trunk/
users/
I want to import this using git svn and use the standard features to correctly interpret the branches and tags.
What I would…
Peter Gerdes
- 2,288
- 1
- 20
- 28
2
votes
1 answer
error when updating my branch by merging from trunk
I need to get the latest changes from trunk into my branch, so i executed a svn merge ^/trunk/FW which until now has worked just fine (with minor conflicts that I've been able to fix manually). But I'm now getting a conflict that I don't know how to…
stdcerr
- 13,725
- 25
- 71
- 128
2
votes
3 answers
How can one determine if an svn working copy is from branch or trunk?
My project has the standard trunk/tags/branches structure and typically work in the trunk. Before the holiday, I switched to the Branch to make an isolated change and now I have lost recall if I ever switched back to trunk. Is there a way to check…
mobibob
- 8,670
- 20
- 82
- 131
2
votes
1 answer
Is it a good idea to maintain a "trunk" VS project folder in addition to folder(s) for branches?
In using Visual Studio 2010 on PC clients in an SVN environment, is it reasonable to assume that each project really needs a "trunk" reference working copy in addition to any branches that may be in use? I don't see how a single, branch copy without…
David W
- 10,062
- 34
- 60
1
vote
0 answers
SVN Removing branch and add it again with the same name
In remote SVN repository, I have dev branch and trunk.
Every fortnight, we are removing dev branch and making a new dev branch from trunk on the same URL.
But in this process we are loosing the changes/not merged code in old dev branch.
Three…
Vibs
- 307
- 2
- 10
1
vote
2 answers
TortoiseSVN - push only a subset of modified files to branch while leaving the rest
Let's say I have a branch where I have modified a couple of files. Let's say these files are file1 and file2.
Inside file1 I have made modifications that affect only a feature that I'm currently implementing in my own branch. However inside file2 I…
rbaleksandar
- 8,713
- 7
- 76
- 161
1
vote
2 answers
In Jenkins, how can I specify which folders get checked out of my trunk in the "Source Code Management" section?
I’m using Jenkins 1.651.1 running on JBoss 7.1.3.as.final.
I have a Maven job configured to use SVN.
In my Source Code Management section, I have selected "Subversion" which is our source code repository.
In the repository URL section, I have…
Dave
- 15,639
- 133
- 442
- 830
1
vote
0 answers
SVN Merge - Merge Changes from Trunk down to Branch not Reflected on Moved Files in Branch
I've got a folder restructuring project which is going to take an extended period of time. The restructuring will have breaking changes and cannot occur in trunk. So the goal will be create a new Branch and keep it parallel to trunk, merging down…
Jeffrey Haley
- 11
- 2
1
vote
3 answers
Tagging in Subversion - how do I make the decision about continuing to work on my trunk vs. the new tag?
I'm running Tortoise SVN to manage a project. Obviously the principles around tagging apply to any implementation of SVN but in this question I'll be referring to some TortoiseSVN-specific dialog boxes and messages.
My working directory and the…
Howiecamp
- 2,981
- 6
- 38
- 59
1
vote
2 answers
SVN Branch in sync with trunk
I am using SVN and my repository contains a trunk:
trunk
|
|_____A
|
|_____B
|
|_____C
I also have 2 branches with the same structure as the trunk:
branch
|
|_____DEV
|
|_____A
|
|_____B
|
…
duncanportelli
- 3,161
- 8
- 38
- 59
1
vote
3 answers
SVN branch as version with permanent maintenance
In the company i'm working on we have releases every x amount of time (usually three months). During that time, we have between four-six 'branch-releasable' sprints and all our code goes into that branch.
Some time later the branch is released as…
Julian
- 253
- 3
- 14
0
votes
1 answer
SVN merge svn:externals from trunk to branch
We merge changes from time to time from trunk to our current branches. We use SVN 1.7.6 and tried it with SmartSVN and Tortoise SVN.
It does not work to merge the changes made in the svn:externals property (new externals, raised fixed revisions of…
Creepin
- 482
- 4
- 20