All Questions
76 questions
0
votes
1
answer
29
views
How to best organize my code in SVN repository(ies?)
I currently have 2 locations of code: codeA and codeB.
CodeB is a copy of codeA, but multiple developers have access to codeB. There will be regular updates to codeA that will need to be integrated ...
1
vote
0
answers
16
views
Replace SVN trunk with brand new version
I'm working on a branch of a mobile application where:
The platform has changed from Windows Mobile 8.1 to UWP
Libraries have been updated to UWP versions
Various code changes related to the library ...
- 163
0
votes
0
answers
103
views
How to merge changes from two branches and test before committing to trunk?
i've got work in two branches and one depends on changes in the other, i.e. I want to test both branches combined before I go ahead and commit trunk to the repository.
what I tried is to --reintegrate ...
- 15.5k
2
votes
2
answers
424
views
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 ...
- 7,900
0
votes
1
answer
158
views
How to check if the file from wc is in /trunk or /branch - TortoiseSVN
Let's say that I work in /trunk, and I switch only specified files to /branch, and not the whole wc. This allows me to make general changes in /trunk and I can get updates from other colleagues, while ...
- 21
0
votes
1
answer
119
views
Where work with Git (Branches or Trunks)
I use SVN and have 3 environments
Development environment
Preproduction environment
Production environment
Actually, all the team work with the trunk.
We want to migrate to Git.
Where we should ...
- 710
1
vote
1
answer
634
views
Trunk Based Development suggestion required
I was looking up good resources on branching strategies after doing feature branching for quite a few years and struggling with lots of branches and merge nightmares. Feature branches did give us a ...
- 174
1
vote
0
answers
31
views
My very small company has reached the point of needing a VCS. I'm trying to plan our actual version control strategy first
First and foremost, please excuse my writing: I'm a programmer fresh out of college with minimal professional experience. If anything is unclear, please bring it up and I'll do my best to clarify.
I'...
- 11
0
votes
1
answer
1k
views
SVN - Merge working copy into another branch
I started doing a bunch of changes in a branch that should have happened in trunk. I have not committed those changes yet, so my branch has a bunch of uncommitted files.
Trunk shares a same revision ...
- 1,512
-3
votes
1
answer
1k
views
what is the --reintegrate option used for in svn
I have been working on a banch from trunk, I continously merged changes from trunk into my branch to ensure that I don't get away from the trunk with svn merge ^/trunk/FW. Now the time has come to ...
- 15.5k
0
votes
0
answers
75
views
Tortoise Merging Trunk to Branch delete folder on branch
Good morning in my timezone.
I am merging the trunk to a branch , and during the process it deletes a folder that just exist in the branch(this folder is versioned). Why is this happening ?
Thanks in ...
- 1,849
1
vote
1
answer
49
views
How should ChangeLog files be used when dealing with a trunk and branches?
I have a Subversion-based project that is of a fairly standard form, featuring a trunk directory, a branches directory and a tags directory for the usual purposes.
In the trunk is a file called ...
- 8,275
1
vote
2
answers
944
views
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
...
- 3,219
1
vote
1
answer
162
views
Is it OK to deviate from trunk/tags/branches structure in SVN?
We have our projects in SVN and I am trying to increase the level of automation in our release process.
Historically we developed on trunk and then tagged on release, which entailed a manual (albeit ...
- 932
-1
votes
1
answer
212
views
Subversion : Why do my project in subversion "branches", "tags", "trunk", and "wiki" folders does not exist?
I just created a project in subversion, but why the folder branches, tags, trunk, and wiki does not exist ?
I have checkout and commit some files, but these folders still not exist.
How do I create ...
-1
votes
1
answer
62
views
Merging a branch and a branch off that branch back to the trunk
We have a project in SVN, and we work out of the trunk. I had to cut a branch for a release, let's call it branch A. A little later I had to cut another branch off of branch A. Let's call it branch B. ...
- 149
0
votes
1
answer
82
views
How to merge modifications from specific revision to trunk sub-folders
I have some files in my branch directory that I want to merge with the trunk. But want to do this only for a specific revision, and apply the modification for all sub-folders.
So, my files are ...
0
votes
2
answers
9k
views
SVN: Committing Changes Made to Trunk to a Branch
I have made a checkout from Trunk, made changes and committed the changes back to the trunk. Now, I want apply those changes to a branch as well. Can I switch my working copy to that branch and then ...
user2295633
0
votes
1
answer
2k
views
svn / Tortoise checkout from trunk to a working copy of branch
SVN, trunk (mainline) for Product, I have my own branch.
I need to copy a selected file from trunk to my own branch. To do that I:
rclick working copy folder
select TortoiseSVN/Repo browser
go to ...
- 6,716
2
votes
0
answers
269
views
Branch into trunk merging and vice versa
Generally, after creating a branch, I still can develop further on on the trunk AND the branch. This leads to following use cases for me:
Use cases
A. branch was created from trunk and changes were ...
- 17.7k
3
votes
2
answers
18k
views
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 ...
- 4,061
0
votes
1
answer
301
views
Continuous merges from Branch to Trunk
If I'm to use Tortoise-SVN in a situation where I'll be wanting to periodically merge from Trunk to Branch and also Branch to trunk, how should I be doing the latter?
The "Branch to Trunk" tutorials ...
- 879
1
vote
1
answer
506
views
Move project in svn from root to /trunk
My project is in SVN root directory, but I need move it to /trunk to become use branch.
Can I move it with saving all commit history?
- 7,214
80
votes
3
answers
124k
views
Svn switch from trunk to branch
I am in the root folder of an SVN-hosted project's trunk and am exploring setting up two branches.
One branch will be a "snapshot" of the project at the current (stable) revision, and a second ...
- 96.8k
1
vote
3
answers
3k
views
Svn merging branch to trunk keeping the old branch
I followed following steps to merge my branch to trunk.
Check out a copy of trunk:
svn co svn+ssh://server/path/to/trunk
Check out a copy of the branch you are going to merge:
svn co svn+ssh://...
- 1,584
21
votes
3
answers
18k
views
SVN to Git Branch/Tag/Trunk
I am making the leap from SVN to Git (though, my respect for SVN will still hold) and I had a few questions for some SVN to Git terminology. In SVN, many repositories are setup like this:
- trunk : ...
- 17.3k
0
votes
1
answer
85
views
Are two svn commands the same ?
I create a branch for myApp, for example myApp1.0 at revision 100, the next revision on trunk is 101. My svn code structure is:
/trunk/myApp
/branches/myApp1.0
After doing some work on trunk/myApp, ...
- 343
0
votes
1
answer
937
views
SVN :- Bash script to create a branch from trunk with limited files
I am trying to create a Bash to create a branch from trunk. But i need to take care that some of files will not be a part of new branch, it should be in trunk only.
Please help me on this if any hint ...
3
votes
1
answer
1k
views
SVN: automatic checking if all changes from branch are merged with trunk [duplicate]
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 ...
- 449
1
vote
0
answers
28
views
Fetch information after svn's branch deleting [duplicate]
We had an svn branch an everybody committed there. Then one programmer deleted it and created it again by copying trunk. So, important commits have been deleted in that branch. Do we have any chances ...
- 1,587
1
vote
2
answers
62
views
how can I figure out when a branch in git was merged into the trunk
I'm trying to figure out the revision in the trunk when a branch was merged in, but I'm not sure how. Thanks for the help.
- 2,173
2
votes
4
answers
87
views
What's the best practice to make a new branch based on project without trunk directory in SVN?
I just jumped in a project, and the project is maintained in SVN. However it does not have trunk directory, and now I want to do some experiments on the project, but I don't want to interfere with ...
user618815
2
votes
1
answer
223
views
TFS 2010 – Each new branch inherits custom groups permissions from main trunk
When branching from the main trunk in TFS2010 all the custom groups and permissions (as granted in the main trunk), are inherited by the newly created branch. This results in a fair amount of ...
- 329
1
vote
2
answers
154
views
Moving from single developer to multiple in SVN
I have recently started a new job and up to now they have only had one developer. Using Eclipse and Collabnet with Subversion.
So, he hasn't had any problems with clashes etc.
Even more so because it ...
- 6,881
1
vote
2
answers
3k
views
Problems with reintegrate branch to trunk in SVN
I'm trying reintegrate branch to trunk, but when i click "Test merge" in the TortoiseSVN, I get this message:
Command: Reintegrate merge https://127.0.0.1/svn/global/branches/somebranch into D:\...
user658599
1
vote
0
answers
1k
views
Keeping a SVN branch up to date with the main trunk
I have branched from the trunk few days ago at which point i had an identical copy. I have made some modifications on couple of the files.
The main trunk has had some changes which I want to merge ...
- 354
3
votes
1
answer
320
views
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 ...
- 16.7k
1
vote
3
answers
206
views
SVN : How to fix a commit erroneously made to the trunk instead of to a branch?
I recently created a maintenance/bug-fix branch in our SVN repository, in order to make stable releases while we will introduce new features on the trunk. This branch is called "4.2.x"
Now, one ...
- 17.4k
1
vote
1
answer
166
views
(svn) merging back the refactorings but not the whole branch, possible ?
I noticed a(n) (anti-)pattern in my team:
We decide to implement a feature so we (svn) branch.
While implementing the feature, we do refactorings that would benefit everyone if they could be merged ...
- 22.3k
2
votes
1
answer
651
views
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 ...
- 5,548
1
vote
2
answers
3k
views
How to check the merges between branch and trunk in SVN?
I have committed many changes in branch , after merged to trunk.
So I have done many commit, merge, commit operations.
Now I am not sure that all was made correct.
Can I check if I not missed merge ...
- 11.4k
1
vote
1
answer
72
views
How to fix a badly setup svn repo
I have an svn repo that was setup (not by me) without the recommended folders (/trunk, /branches, /tags) which was fine initially, but we are running into problems that really should be fixed in a ...
- 10.3k
0
votes
1
answer
293
views
How do you manage your release branch in SVN?
We use Subversion for our source control system and we do our mainline work in trunk. When we released our software we created a branch. When we need to upgrade our release I will merge revision ...
- 1,917
36
votes
2
answers
19k
views
Configure TeamCity to build from SVN trunk, branches and/or tags
How can I configure TeamCity to build from SVN trunk and also from different branches and/or tags ?
Our idea is to have multiple builds from the same project, this way we can have the current version ...
- 639
1
vote
1
answer
165
views
Subversion Merging branch into trunk when trunk is outdated
A branch has become the most current line of development so the trunk was outdated. When merging the branch back into trunk through "Merge two different trees", none of the history of the changes in ...
- 11
0
votes
4
answers
326
views
Use of trunks, branches and tags in a project
I know the theory but how is svn used from a practical point of view for a project? Say, I have a web site with features that are going to be modifed or added. In what cases would new trunks, branches ...
- 19.6k
5
votes
1
answer
714
views
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 ...
- 513
2
votes
2
answers
2k
views
Replace entire SVN directory
I have a SVN project I'm working on that is entirely too messy, resources are named horribly, project files are full of erroneous information and links that are almost impossible to search and destroy....
- 2,055
2
votes
1
answer
358
views
git-svn: replacing trunk branch with another
How to replace the trunk branch with another in svn repository using git-svn tool?
- 818
1
vote
2
answers
2k
views
Using Trunk / Branches and Tag structure between multiple developers
I end up getting confused when it comes to Trunk / Branches and Tags. Following is my query:
We have a team of developers working on a single project. The developers are often divided in groups and ...
- 45