I have an SVN repository set up with the following directories: /branches/ /tags/ /trunk/ I created /branches/my_feature/ using svn cp trunk branches/my_feature That's fine. I now want to keep my branch up-to-date with trunk, so I run (with cwd = branches/my_feature) svn merge ../../trunk and it pulls everything down, showing th...
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 have a trunk folder that will always build. Major changes are then create in new branche...
There are a lot of guides on Git commands but I haven't seen many that explain how developers actually use it on a day-to-day basis. I understand the basics of push, pull, commit, etc... but I don't understand when to use branches. On the local repo: Should you create a new branch for every set of changes or is okay to work on the mas...
With SVN, I have the following setup: /tags/ /trunk/ /branches/ /branches/my_feature /branches/my_other_feature I want to keep all the branches in sync with mainline trunk, so I periodically run an svn merge for the branch for trunk. However, I also want to keep all the branches in sync with one another, so as to avoid conflicts, as ...
I have a situation where I will have to rebase a topic branch to a master. That's fine, it's the normal rebase case and works great. The complication is when I'm trying to get this process to be in sync on a bare remote repository. e.g. o--o--o origin/master \ o--o origin/topic o--o--o clone/master - tracking origin/m...
Hello, I have got the git branch I'm working on to a nice place. So I make a commit with a useful commit message. I then absentmindedly make minor changes to the code that are not work keeping. I now want to changes branches, but git gives me, error: You have local changes to "X"; cannot switch branches. I thought that I could change ...
I have done a lot of development on a branch in my subversion repository. Throughout this I've merged in the trunk changes by manually tracking which ones I put in. I accidentally read an SVN 1.0 book which explicitly told me that SVN doesn't track which changes have been merged, so I tried to specify which ones to merge into my branch t...
I have to rewrite the history of my repository because it contains some credentials. As I have to amend the root commit I followed the instructions from Git Faq. My problem is though that I have two branches and several tags already in the repository and I'd like that my history rewrite to apply to those too. The repo isn't public yet, s...
I did a checkout from my trunk to a local DIR and made lots of local changes there. Now I don't want to commit it back to the trunk, but I'd rather make a branch from this local version. Is that possible? Can I just copy the trunk to a branch, and then cd DIR and svn switch to the branch? UPDATE: Thanks for the answers, it worked! To s...
I'm working with an SVN repository that is laid out like this: $SVN/[project]/trunk $SVN/[project]/branches/[user]/[branch] $SVN/[project]/tags/releases/[tag] My .git/config looks like this: [svn-remote "svn"] url = $SVN fetch = project/trunk:refs/remotes/trunk branches = project/branches/*/*:refs/remotes/* When I...
My team recently decided not to use the "trunk" branch that is typical of most subversion repository layouts. We found that at any given moment there was always a particular branch that functioned in the traditional role that trunk would hold in other repositories. That is, we always have a highest-numbered branch that represents the nex...
Hi, I'm using cvs2svn to convert my repository. I've done it with success in one repository, and now my new problem is a second repository. In my new conversion, I want to convert only the HEAD and one branch. cvs2svn only have "exclude" function for branches, but not "include". I have many many branches and excluding each and every on...
If a file has been changed by 10 different changesets, with different users for various changesets. Then the user that checked in changeset 5, decides to merge his changes. What will then happen to the changes in changeset 1 to 4? Will they automatically be merged? ...
Suppose I am developing a web application that uses a database, and I create a branch in my version control system which requires significant database changes. Let's suppose I can't just use the normal trunk database as I often do for other branches, and in this case I actually need a new copy of the database for my branch. Now, suppos...
When using source control, the way I am used to working is to develop on the trunk and then branch the trunk just prior to moving into QA. I was talking with some other people in the department and apparently there are some passionate views about a different way of working, which would be to create the new branch at the very beginning o...
I've got a funny feeling I'm going to feel stupid after seeing the replies to this. I've been working with Git for a bit now and only just started using branches. I have a couple of branches: 'experimental', 'something' and 'master'. I've switched to the 'experimental' branch for example, and started working and testing as I go along. ...
I have just done something without thinking it through. I have made a branch from working directory containing local modifications using TortoisSVN. I am assuming it did a copy and switch in one shot. Now the first version of my new branch is different from any version of the trunk. The question is, how do I reintegrate this branch b...
What is the best implementation, from a performance point of view, of branched function calls? In the naive case we have a rather large switch statement that interprets bytecode and executes a function call depending on code. In the normal case we have computed gotos and labels that do the same thing. What is the absolute best way t...
My git repo contains sensitive passwords which, for reasons out of my control, can't be removed right now. Right now it's all OK because this repo is internal-only, but I've been asked to create a branch that's safe to share with partners. Is there any way to create a branch in git and then remove files from it in a way where they can'...
Background: I've inherited some MATLAB code to analyze data for my Ph.D. research. To help me better understand the code, I've pared the code down to the minimum subset of files required to run the code for a sample test case. Question: I would like to commit this code to a version control system as two branches, a master branch contai...