I've scoured the web and found a lot about working with git-svn and branches, but nothing that fits my situation. I'm working on a large project, and I work on several of many branches throughout the week. Standard ways of handling git branching wouldn't work for me here... just because of the size of the code involved. It takes about a...
master branch has these files and folders (simplified): C:\Local\TickZoom\Project>ls file.txt name.txt public public branch is tracking a vendor repository and has been subtree merged as public folder in master branch above. public has three folders only (simplified): C:\Local\TickZoom\Project>ls platform providers www...
I've seen several other posts similar to this (namely http://stackoverflow.com/questions/5237/solutions-for-working-with-multiple-branches-in-asp-net) but there are several issues that I have that seem to be different than other similar posts. I have an ASP .NET application that uses a virtual directory off of localhost. There are sever...
I have two branches off of master, each one for a different feature, and then I have a synthesis branch that combines the two. I committed something to the synthesis branch, but now I see I would have rather applied that change to one of the branches particular to that feature. Is there a way to do this unapply/apply somewhere else man...
I read some information about named branches and working with bookmarks. Unfortunately I still don't see a difference between them. Is there any? Is there any difference between: hg branch blah hg up blah and hg bookmark blah hg up blah ? Why would I use a bookmark and how is it different from a named branch? ...
Actually I'm using VSS, but I was wondering if there is another tool for version control with support for labels/tags (the subversion implementation doesn't count:). What are you guys using? ...
I'm new to SVN so this could be an easy question. We have a "trunk" with 1st level directories: 10 <-- documents 20 <-- source code, db scripts, ... 30 <-- documents 40 <-- referenced 3rd party library-es I made a "develop" branch from the "trunk". In "develop" we change our source code and after testing it we merge it to "trunk". T...
I was trying to find out when a certain feature branch in one of my repositories was created and I found that surprisingly hard. I ended up using a combination of git show-branch and git log. Is there any easier way to find this little piece of information quickly and efficiently from the command line? ...
So I have 3 git branches: master refresh auth_upgrade I haven't really been using branches like I should...so master is way out of date, refresh is somewhat out of date and auth_upgrade is actually the branch that is completely current. So...I ultimately want to make auth_upgrade the master branch and then git push it to my github r...
I work on maintaining the same e-commerce web-app for multiple customers. Originally there was a standard set of pages from which all the rest of the customers customizations were derived in the past. Recently the place where I work decided to use Mercurial for version control. They've also decided to re-work the standard set of pages...
We have a TFS 2008 project with two branches ("Main" and "NewFeature"). Each is a complete, independent "copy" (variant) of the source code. By changing the workspace mappings, we can map either variant onto our local PCs and have been working with both branches with no problems. However, if I set up the mappings to switch our build se...
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 2 or even 3 releases. We have been doing all development in branches with a structure like...
I use an ant file to build a java project in mercurial through hudson. The mailnine has a hudson job running just fine. Recently a new branch was created and pushed to the server by commnd line: hg branch newbranch hg commit hg push -f The mainine does not contain these changes and still builds fine. I have set up a new job with the sa...
I'm working in a branch, and got a working copy with is really unclean. When looking through the changes to commit, I wanted a few oneliner fixes to be committed to the master branch. In this case, using git stash is not really helping, because my working copy has lots of other changes which won't merge with master yet. Is there a more...
Hi, I've been using git for a while for my one-man developments, but I haven't run into any tricky branching issues until now and I seem to have forgotten something fundamental that I no doubt "knew" just after reading the Pragmatic Version Control Using Git Book.. I'm often several releases ahead of what is actually published on my we...
If I create a branch in SVN off trunk rev 10 then realized that what I want was rev 9 should i just ditch this branch and create a new one off of rev 9 or is there a way to "rebase" it off of rev 9? The problem is that in my code I had to rollback some changes and then create a branch for what I now realize is a long/big change. Since ...
I have a project that uses the default Cruise Control labeller to keep track of the "build number" for the project. We have recently branched a project version, and I've added an additional Cruise Control project for the branch. I would like the branch to use the same build number sequence as the trunk. However, rather than simply using...
In CVS, my working copy (WC) is on a certain branch (which we'll call "foo"). There have been other changes checked into foo by another dev. I want to do a diff between my WC and the upstream state of foo. Normally, when working in the trunk (HEAD), I just do a cvs diff, and that's fine. But for some reason when doing a plain cvs dif...
I created a Git repository on a folder that had a different Linux owner than my user. It wasn't until much later that I set the group permissions to write so that my user could make changes and commits to Git. However, whenever I switch from a branch to master, all the group write permissions are lost. I've tried switching to the master...
I'm working on some new components in my framework for a gettext implementation. It needs to support the dead php4 and php5+. I'm using Zend_Translate and I will implement a gettext based class for php4. I'm wondering if it's ok to rely on the phpversion function to branch out on which class to implement. Something like... $version = ...