svn,version-control,tortoisesvn , SVN: Adding a new branch to the “Choose items” list


SVN: Adding a new branch to the “Choose items” list

Question:

Tag: svn,version-control,tortoisesvn

Apologies if this is already covered somewhere, but couldn't find an existing answer at least on a short search.

The last bullet is my current problem. I solved the middle bullet earlier by using the "Choose Items" option when doing the initial check-out from the repository root, which resulted in a folder structure like this:

SVN tree before

Now when I clicked "SVN Update" from "Top" it works nicely to update all three locations (V12_0, Feature_A and trunk).

But then the last bullet's problem comes when later a new branch called V12_1 is added. The tree would look like this:

SVN tree after

I can get the tree to look like this by doing an "SVN Checkout" from the "branches" node and selecting the V12_1, but when I then try to do an "SVN Update" from "Top", it still only updates the original three locations, but not the new V12_1.

I know I could get this to work by deleting the local checkout completely and doing again from the "Top" level the "SVN Checkout" and with "Choose Items" selecting all the branches (V12_0, V12_1, Feature_A and trunk), but since the branches are big, this would take time, and anyway I'd be interested to know if there would be a more elegant way to achieve this.

Finally, a bonus question (this I haven't tried yet): What about deleting a branch locally when it's become obsolete? So assume I don't need V12_0 anymore - can I just delete the folder locally, or if I do so and then take "SVN Update" from "Top", will it bring the V12_0 back?


Answer:

Don't do "checkout" to add the folder. That is creating a new, nested working copy that is completely separate from your top-level working copy.

Instead, use "update to revision..." and there will be another "choose items" button which you can use exactly as before when you first created your working copy.

Alternately, from the repository browser, if you right-click the branch you want, you should be able to "update item to this revision" to pull it down into your existing working copy.

For deleting a branch from your local copy, you should right-click that branch, and use the "update to revision..." dialog again. From there, set depth to "exclude". Otherwise, when you do an update, TortoiseSVN will restore the branch.


Related:


Using git for remote and svn for local


git,svn,tortoisesvn
At work we used SVN until now for a project (we use TortoiseSVN). For the same project, someone from another country uses GIT and made changes to it. We want those changes on our project, and to push it back to the remote project on their server. I already pulled...

Get list of changed files from remote server git


git,svn,github
Is there a hook that gives the file name as soon as someone commits their change and merges with master from remote server? . I basically want to get a trigger that someone has updated a file on remote repo. Details like what file has been changed.

SVN ignoring.txt does not seem to work in Zend Studio


svn,ignoring
I added ignoring.txt at the root of my project. Inside I have this: php.tags .local.vimrc For some reason when I bring back these two files and try to commit I see them in the list of files to commit. I did commit the ignoring.txt file. Is there a step that...

How can I skip special kind of files while cloning a remote subversion repository?


svn,svn-checkout
How can I skip on the fly static files like images or documents that I don’t need while cloning a remote subversion repository?

Is it possible to keep history of code moves between files in SVN?


svn
In a project versioned in SVN I need to do a refactoring that consist of moving chucks of code from one file to another. Not to move or rename the whole file, but separating parts of it into another new file. I would like to preserve the history of that...

Manage project backend and frontend in two separate branches or repositories?


git,version-control
I started a project of a mobile app that will have a server-side and the app itself. So, in the master branch I created 2 projects myapp_server and myapp and then I created 2 other branches backend and frontend and I want to push to the separate branches only the...

Should git-flow branches be available on bare repository and its clone?


git,version-control,git-flow
I am attempting to start using git-flow. I have installed and initialised git-flow on my master repository. It is all correct and shows in git.config. It is linked to a bare repository, and I/others clone the bare repository when working. However, when I clone the bare repository, the develop branch...

Multiple streams over single project in Git?


git,version-control,stream,git-branch
I went through blog regarding GIT best practices model. As we are going to make GIT as our major head for SCM for the upcoming projects in our organization, I have some doubts, regarding them not able to find much over internet. Our project architecture is: We have only one...

How to change svn:externals from bash file non-interactive


bash,svn,svn-externals
I have multi externals need to be set within a file externals.txt and I attempt to change the svn:externals from a bash: svn pe svn:externals svn://hostname/branchname -F extenals.txt But the command throws out an error: svn: E205007: None of the environment variables SVN_EDITOR, VISUAL or EDITOR are set, and no...

Cannot use Subclipse after installing


eclipse,svn,subclipse
I have installed Subclipse in Eclipse EE Luna. This is what my installation details look like : Going on past experience, I would now expect a silo icon to appear next to all of my files as they are locally all part of a SVN directory structure. Also when I...

Oracle QSL Developer -> connected to subversion -> show “quick diff” in Worksheet


oracle,svn,oracle-sqldeveloper
Hi I use Oracle SQL developer to develop PSQL .sql files I managed to connect these files with subversion, If I go on the History tab: I can see the diff Is there a setting in SQL Developer that I can see a quick diff in the Worksheet without looking...

Jenkins job setup automation with SVN credentials


shell,svn,curl,jenkins,credentials
I created a deploy script for a virtual machine (Ubuntu). This script installs SVN, Jenkins, etc, created a job in Jenkins using a curl POST request and an uploaded config.xml (this file contains the job details). But then I couldn't set up the SVN credentials with this script. I only...

how to have svn fetch a file from another directory on updates?


svn
I have two repository folder. One in which the build.dll is set. There is another folder which needs this dll up to date. What I'd like to do is when I update the second directory on my computer, it would fetch the build.dll from the other one. So no physical...

Why does the Jenkins SVN plugin give error E170001 when connecting to my VisualSVN server?


svn,jenkins,jenkins-plugins,visualsvn-server
What I know about the VisualSVN server: it supports Windows Active Directory authentication and "basic" authentication using my Windows username and password. I can use TortoiseSVN, CollabNet, and Mac OS X Subversion clients successfully. To replicate the error, do the following: Install the Windows Jenkins package (version 1.616). Update the...

SVN: Adding a new branch to the “Choose items” list


svn,version-control,tortoisesvn
Apologies if this is already covered somewhere, but couldn't find an existing answer at least on a short search. I use TortoiseSVN on a repository which has very many (historical and otherwise) branches, of which I need only a few new ones. I would want to be able to update...

Diff tool in SourceTree


git,version-control,atlassian-sourcetree
I am using SourceTree as a Git client in my windows 7. I faced with a conflict and in order to resolve I click on Launch external merge tool as suggested. A window pops up very shortly and nothing happens then after! I just tried it on my Mac OS...

How to import bugfix of master in all other branches without including the commits before?


git,version-control,merge,git-branch
I have some branches: branch 1 and branch 2. They have their origin from the master branch. Now there were some changes in the master branch. One is a critical bugfix, which has to be imported on branch 1 and 2. But there is a change (or perhaps multiple) which...

subversion ignore nestered externals


svn,svn-externals
I'm working on a big project using subversion, and we use externals everywhere. This makes an "svn up" take forever since it has a delay on each external. To fix this, I want to remove some nested externals. Is there a way to add an external but specify that you...

Apache Subversion pre-commit to restrict files


apache,svn,hook,pre-commit
I'm new to Apache SVN and I need some help to use a pre-commit script to filter which files are being upload to my repository. I was searching a lot and found this script on another question, but it didn't work for me. #!/bin/bash REPOS=$1 TXN=$2 AWK=/usr/bin/awk SVNLOOK="/usr/bin/svnlook"; #Put all...

Using git with Doxygen FILE_VERSION_FILTER


git,version-control,doxygen
What command would be used with git for the doxygen FILE_VERSION_FILTER? The output would preferably be the number of times that file as been revised in the repo.

Trying to understand git upstream branch


git,github,version-control
I have a git project. The remote only have a master branch, at local I have a master and proj-structure branch. I created the proj-structure branch using 'git branch -b proj-structure'. I am currently at proj-structure branch at local, when I try to git push, the git suggests me to...

How to tell git-svn that files are NOT binary


git,svn,migration,git-svn,gitattributes
I am converting a large SVN-repo (~28k Commits) into Git using git-svn. When the process was through (~ 1 1/2 weeks) I encountered some .ps1-files being treated as binary in the diffs. I have commited a .gitignore file on master (after the conversion of course) that tells git to treat...

Migrating Codeplex SVN to Git with git svn clone


git,svn,git-svn,codeplex,migrating
In the past (2013), I was able to migrate a repository from Codeplex (under SVNBridge) to a Git repository. I'm trying to do this again, with the same repository, and the 'git svn clone' method is not working. Basically, it creates the .git folder and it's all. No code is...

Unable to understand Cruise Control build error


svn,windows-server-2008,cruisecontrol.net
Please bear with me since I'm recent noob to Cruise Control. I'm getting following error while I force build process through dashboard. ThoughtWorks.CruiseControl.Core.CruiseControlException: Source control operation failed: . Process command: C:\Program Files\TortoiseSVN\bin\svn.exe log "http://xxx.xxx.xx.xx/svn/SampleProject/Source Code/" -r "{2015-06-08T13:00:07Z}:{2015-06-08T13:00:13Z}" --verbose --xml --username tom.bush --password ******** --no-auth-cache --non-interactive at...

I have deleted my project.pbxproj file using git checkout — . Should I delete the branch locally and pull from origin?


xcode,git,github,version-control
I have gotten myself into some hot water regarding source control. I had just gotten a feature branch to work that another developer on my team had created and developed, which required adding some files. He then added some additional code to the project, and I wanted to revert to...

Missing information while migrating SVN repo from one server to another


svn,apache2,ubuntu-12.04
I want to migrate data from old SVN server to new server. I need a SVN location with 2 folders trunk and branch. I also want to be able to add new folders at a later point in time so that i can just move the source code to new...

How to correctly set an external path on SVN?


svn,tortoisesvn,svn-externals
I'm trying to set an external path on SVN. Here is what I do in SVN: Right click on folder where I want an external Select "Show Properties" New -> Externals In "Externals", I click New At local path, I tried setting the path I wanted, but whatever I set,...

Git - xcode - single project multiple developer on LAN


ios,xcode,git,svn,git-svn
Using facility of git which is provided in the xcode I have setup one project. I got the understanding about the branch, commit etc from This link Now I want to share this project with the other developer who can make change in this project from his own mac. Both...

one eclipse install not displaying utf8


java,eclipse,svn,utf-8
I have Eclipse installed on an old machine and a new machine. I download from svn repository on old Eclipse, UTF8 character in a java file displays fine. I download onto new Eclipse, UTF8 character displays as "?". I deduce that the file is saved correctly in SVN. I have...

Is there any way to checkout the previous commit without knowing the ID? [duplicate]


git,version-control
This question already has an answer here: Git relative revision numbers 4 answers If I am going to use checkout to find bugs in my code, I think it would be helpful to be able to checkout the previous commit without having to lookup its ID with git log....

How to `git add` non-recursively?


git,svn,recursion
When I git add a folder, the whole content and all subfolders are staged automatically. In case the folder contains subfolders which I do not want to commit, I have to unstage them manually and add them to .gitignore afterwards. The explicit unstaging feels like I'm doing something wrong here....

SVN Update not applying. Despite files marked as out of sync


svn
I recently created a project structure in SVN. Checked my project into the app folder, then made a number of edits. I was editing a version of the project that was not checked out however (my original project that I copy/pasted into the new SVN repo). I guess I just...

PhpStorm Git folder modified color


git,version-control,phpstorm
My PhpStorm is coloring changed files when a project is under Git, I want to color the folder also so I can notice that there is a file changed under that colored folder. Thanks....

Remove a specific checkin revision from SVN code


svn
Is there a quick way to remove a particular checkin from SVN codebase? For instance, my latest SVN revision number is 9999 and I want a code which do not have code checked in for revision 9978 & 9979. This is how I am doing it right now: Take the...

Git: revert entire repository


git,version-control
tl;dr: Revert my entire local repository to a specific point in time. I want all branches to be reverted to that point. I want all commits that came after that point in time to be completely gone. I guess a good way of depicting it would be to cut...

Git: how to commit and cherry-pick bug fix? [closed]


git,version-control,git-branch
Our development team uses a dev branch for majority of commits and branch out each month for release branches. I was wondering what's the most popular model to handle bug fix commits. Commit to HEAD of monthly branch (most recent one, say 2015.Jun branch) and cherry-pick (or just rebase) to...

Jenkins SVN on slaves


svn,jenkins,tortoisesvn,jenkins-plugins,jenkins-cli
I have a jenkins server which I configured to use SVN 1.7 (Manage Jenkins->Configure System->Subversion->1.7). I have a slave that i installed tortoiseSVN on, and added it the PATH variable in the slave machine. When i run svn --version in the slave i see svn, version 1.7.18 (r1615261) compiled Aug...

how to commit file without keeping modification history on svn


svn
on SVN repository, we have a file which needs to be uploaded with an executable. However we do not want to keep the changes made on this file, so we'd like svn to just crush the old file without comparing it with the new one. Is there another way to...

Using mergeinfo to compare branches with different roots


bash,svn
I am comparing branches with svn mergeinfo http://myserver.com/branches/FeatureBranch http://myserver.com/branches/UAT --show-revs eligible which shows if anything is in the feature branch but not in UAT. However, someone has created a branch from a branch and made 2 commits. When I run the command it lists all the commits from the original...

SVN commit messages are not getting updated


svn,tortoisesvn
I have updated some of SVN commit messages using below command: svn propset --revprop -r $version --force svn:log " $logMsg " But, in SVN GUI the "show log" option still displays old commit messages. And one interesting fact I noticed is that when I try to edit the commit message...

Reverse Merge and svn:mergeinfo


svn,version-control,merge
We are using SVN to manage a development pipeline, in which we merge changes from the first stage of the development environment into a second-stage branch. We have created tools that will merge revisions from the first stage into the second stage. What we want to do is alert users...

Which git feature should I use for breaking big commit (pushed and reversed) into smaller commits?


git,version-control,commit,rollback,cherry-pick
I use Atlassian SourceTree to work with git repository. I committed and pushed big commit where desired and undesired changes were mixed. I rolled it back by committing and pushing Reverse Commit. Now I want to extract desired changes from that big commit and commit them as smaller commit or...

git - create a new branch from local copy and then merge it with existing branch


git,version-control,merge,gitlab,pull
Being a git newbie, I have messed up a little bit in the way I handled a new development and I do not succeed in resolving this properly. I have a master branch. I made a local copy of this master branch on my desktop computer and then I removed...

Netbeans 7 does not recognize Subversion 1.8 working copy


svn,netbeans-7
I've just updated my PC and installed Windows 7 64-bit and also installed TortoiseSVN 1.8.13. It uses SVN 1.8, so it asked me to upgrade my working copy of J2EE. It was previously from SVN 1.7. Now the problem is, whenever I try to see the changes or refresh /...

Hg Mercurial - Upgrading code not in repository


version-control,merge,mercurial,tortoisehg
I have a customized local repository of NopCommerce 3.5. The new version of NopCommerce (3.6) is out and I would like to try to update to it. I downloaded their source code and I would like to somehow replace all the files in my local repository with the new files...

git - put files back under version control


git,version-control,bitbucket
The situation I have now is this: I took the project files from the server, unversioned, and copied them on the local machine. I did git init on it, added origin, pushed the files into the repo. Made a branch, made changes to this branch, committed, pushed them into the...

Push remote specific branches with different names


git,version-control,push
Lets say we have origin with a branch called master which would be checked out by; >> git checkout master Switched to branch 'master' Your branch is up-to-date with 'origin/master' Now I add the remote fork also with a branch called master which would be checked out by; >> git...

How does one move a file erroneously added to a branch / commit to a different branch / commit in Git?


git,version-control,git-branch-sculpting
I have a file (driver_06_05_2015.view) in branch ServiceProvisionSpecialist_06_08_2015 that shouldn't be there and was mistakenly committed to that branch even though it should be in the driver_06_05_2015 branch. Is there a way I can move just the file (not the entire commit) to the driver_06_05_2015 branch by rewriting history...