It's my first time using a DVCS and also as a lone developer, the first time that I've actually used branches, so maybe I'm missing something here. I have a remote repository from which I pulled the files and started working. Changes were pushed to the remote repository and of course this simple scenario works fine. Now that my web app...
Part of the team is working on next release / sprint, the rest working on testing and bug fixing the previous sprint before a release to production. The part working on next release wants the branch now, the other part wants it as late as possible because they will have to start merging fixes as soon as we branch. I don't like making...
I'm trying to combine code on two branches with the 'git merge' command, but git is crashing during the process. I need to find an alternative way to merge these branches. To increase merge output to a debug level I ran: $ export GIT_MERGE_VERBOSITY=5 I am currently on the destination branch. git-status shows everything clean an...
Hi, I have access to a repository that IT has created for me. http://oursvn_server/mysvn_repo I have access to the CVS files which can be accessed via /proj/cvs/ I want to convert all files/directories from /proj/cvs/* to http://oursvn_server/mysvn_repo/* I can't do this at /proj/cvs/ level and I want to bring the directories in /pr...
Lets say you have an application. This application is to be QA tested and deployed to production. There are some constraints on the application lifecycle. Only one version of the app will ever exist in production. Once deployed to production if required hot-fixes may have to be developed. Hot-fix are narrowly targeted to fix specific h...
I am having an issue with rebasing from master on to a 'deploy' branch within one of my repositories. My repo is setup as follows: master - of course, the main branch deploy - a branch created where files like Capfile, deploy.rb etc are created and configured - these changes will NEVER be merged back into Master Generally my workflow...
I am developing a platform to automate and integrate feature branching steps in our environment. Now I know that the right procedure to reintegrate a branch is: svn merge URL/trunk (in branchworking copy to sync with trunk) svn update (in trunk working copy) svn merge --reintegrate URL/branch (in trunk working copy) The point on...
I have checked out a specific Subversion branch of my app. Call it '1.0'. I have been working on some changes, added some new files, etc. but haven't committed the changes yet. However, I don't want to commit the changes to the '1.0' branch. Instead, I want to commit my changes to a new '1.1' branch. As far as I can see I will need ...
We have under version control(SVN) a web application. The trunk always contains the latest good version of the website. I would like to hear how other teams manage multiple versions of the same site and how do you publish different versions for UAT, testing, Bug fixing, enhancements etc? Let's say our biz users come along and they wan...
I've been doing some development on a branch and realized that before it could be complete something else need to be done first. I decided that I would branch my current branch and do the requiste changes in that branch then merge them back together and then merge my working branch into default. Basically I expected this: | | + requiste...
I have a project using Git where I've branched off of master to rename a directory. The rename in the branch works as expected. When I switch back to the master branch the directory has its original name, but there's also an empty directory tree with the name that I changed it to in the branch. Is this the expected behavior? Am I missi...
I'm relatively new to Subversion, hoping to get some insights from more experienced folks. We're taking an approach of doing the bulk of the development work (new features and bug fixes) on the trunk and merging bug fixes into release branches as needed. With this approach, developers won't be coding directly against release branches at ...
When using Subversion, should developers be working off the trunk or should the trunk be only used for merges from each individual developer's branch and watched by a continuous integration service? ...
Hi all, A few weeks ago I started making a change in my SVN repository's trunk that I thought was going to be fairly minor. After a few hours of work, realizing that the change had bigger implications than I thought, I decided it was too risky to check my changes into the trunk right away, so I made a branch, like this: svn copy . htt...
I'm trying to merge changes from a branch to the trunk, for a single file and a single revision. I'm using VisualSVN as the front-end. So I right-click the file, Visual SVN -> Merge, then select ‘Merge a range of revisions’, then enter the revision number (from the log) and hit Next. Then I click ‘Test Merge’ What I get is the followi...
So, I'm already familiar with this: http://svnbook.red-bean.com/en/1.5/svn.advanced.vendorbr.html My question is how do you handle a vendor branch that has both a stable release and an alpha/beta branch that you want to integrate? So, say you follow the original example from the SVN book. You'd have: svn://localhost/home/svn/vendor/li...
Is it possible in git to switch to another branch without checking out all files? After switching branch I need to delete all files, regenerate them, commit and switch back. So checking out files is just a waste of times (and there are about 14000 files - it is a long operation). To make everything clear: I need all this to upload docu...
There's a special place in hell for people who hardcode absolute paths and database credentials into multiple random places in web applications. Sadly, before they go to hell they're wreaking havoc on Earth. And we have to deal with their code. I have to perform a few small changes to one of such web applications. I create a new branch...
I am using Git to track my documentation latex source. I want to keep the master branch full of documents that are suitable for end user release, so when someone needs something, i can just switch to the master branch, compile and hand out the document. I make new branches when a manual needs a major update. But, when the manual is app...
Hopefully this makes sense: In subversion if I branch a trunk and then fork the branch can I merge changes from the trunk into the forked branch? ...