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?

153 questions
3
votes
1 answer

How to re-integrate a branch in tortoiseSVN

I have finally successfully created and worked in a branch. I have commited my changes to the branch. Now I want to re-integrate the work in the branch into the main working trunk. How do I do that in tortoiseSVN?
David
  • 14,182
  • 34
  • 96
  • 150
3
votes
2 answers

Running two projects (trunk & branch) at the same time in Eclipse

I was wondering if it's possible to run two projects at the same time in Eclipse, for example by using two different instances of JVM (if that makes any sense). A bit of the background: I have a project that executes relatively long experiments…
posdef
  • 6,196
  • 10
  • 40
  • 85
3
votes
2 answers

Merge from PROD to HEAD or HEAD to PROD?

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…
ripper234
  • 202,011
  • 255
  • 600
  • 878
3
votes
1 answer

Can I make an alternative branch the trunk in fossil

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.
Toby Allen
  • 10,562
  • 10
  • 70
  • 120
3
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,281
  • 4
  • 17
  • 20
3
votes
3 answers

Proper SVN use of branches and 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…
KLL
  • 31
  • 2
3
votes
2 answers

Eclipse project with Subclipse: Introduce trunk and branches

I have a project in my workspace (without trunk and branches) and need to create a copy of the current release for providing bug fixes for this release while working on a new feature, as described here:…
ideaboxer
  • 3,083
  • 6
  • 36
  • 57
3
votes
2 answers

How do I "merge forward" in svn?

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…
Jason Baker
  • 171,942
  • 122
  • 354
  • 501
3
votes
5 answers

Should you use branches in subversion if only one person is working on a project?

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…
Eric Anastas
  • 20,455
  • 32
  • 134
  • 223
3
votes
2 answers

Making a tag into the new trunk in Subversion

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…
Dan Appleyard
  • 7,195
  • 13
  • 47
  • 79
3
votes
1 answer

SVN: automatic checking if all changes from branch are merged with trunk

Possible Duplicate: SVN Automatic merge to branch on check in In my teams people usually develop new code in trunk, then we create a branch and the code goes to production. If there are bugs in production they are fixed on branch and then branch…
Rarar
  • 299
  • 1
  • 3
  • 18
2
votes
1 answer

SVN - Merge branch to trunk, overwrites some trunk changes / new features

So... I have a problem where I created a branch (0.1) and fixed a few things there, but meanwhile I was working on new things in trunk. Now I want to merge branch (0.1) to trunk and before commit I did diff and I saw that some changes should be used…
Matjaz Muhic
  • 4,310
  • 2
  • 13
  • 32
2
votes
2 answers

Purpose of the master branch when branching by rule

From the article Source Control Done Right: With the “create branch” button just a click away, there are a plethora of ways to incorrectly branch your codebase. But there are only two correct strategies – branching by rule and branching by …
Maggyero
  • 3,120
  • 2
  • 24
  • 43
2
votes
0 answers

What to do in trunk-based development with feature flags and breaking changes in library

Trunk-based development pushes all commits to a single branch (e.g. master) and uses feature flags to disable features that are not yet ready for release. Let's say my current release uses a library (nuget package) 1.1 and my new feature requires…
UNeverNo
  • 489
  • 3
  • 7
  • 26
2
votes
0 answers

How to make a H.323 trunk in Asterisk 15

I'm trying to make a H.323 trunk in asterisk 15 (in a remote server with Ubuntu server 16 installed) with ooh323 addon, to test if works I've the softphone ekiga on my local machine. But when I call to test it not even entry the call, the Asterisk…
lilwey
  • 21
  • 3
1 2
3
…
10 11