The project I'm working on includes two what I'll call Libraries of code developed by other teams. Using TFS, we would simply include their TFS folders in our workspaces and include their Visual Studio projects in our solution files. If the other team checked-in a file to the libraries we would immediately get their changes. Obviously y...
We use a JIRA as our ticket system. New bugs/tickets are submitted to that system. Once a bug is fixed, we create a new build and test it on our dev server. If everything is good we push it to the live server. Now I usually work on the trunk without any branching to fix the bugs. This is of course a problem. Because there can be many bug...
So I'm using git and interacting with an svn repo. I have a svn TRUNK that looks like this: A-B-C-D And a svn bug_fixes branch that branches off at commit B or C: -c-d-e-f-g-h-i Now I need to get the cdefghi commits that are in my svn branch back into the master branch. I'm aware that I could just do a squashed commit, let's cal...
Our team had a cvs repository, which we converted to svn via cvs2svn. Our repository has a main branch (let's call in main), that effectively serves as trunk (even though it was technically branched off from trunk far in the past). After the cvs2svn conversion, I branched off main to branch. I made a small change in branch, and then a...
I have a feeling I am asking something that can't be done in git, but I might as well ask. Is there any way that I can make one change and commit it to all branches? For instance, suppose I want to make a change to my AUTHORS file or LICENSE file. I know I can commit the change to one branch and then cherry-pick it to each branch indi...
Hi, I have a maven multi module project. If I need to branch, I use the maven-versions plugin to go through my project and update the parent version number rather easily. Is there a similar plugin to update my scm location in all of my poms? ...
We have project (PHP application), but instalation for each client vary, sometimes very little, sometimes more. Still, big part of source code is common. We manage specific installations as parallel branches to master branch and we need to transfer changes from master to other branches. Same situation was solved in Git: how maintain (mos...
I'm having the following problem: I commited two changesets into the default branch, but now I think I should put them into a new branch. That means I want to branch of from the revision before these changes happened, put those changesets into the newly created branch and erase them from the default branch's history. What's the best way ...
I had checked out an old hash (commit) and was working on it, checking in merrily and ignoring warnings that I wasn't working in a branch. Then I switched to a branch and realized that I had no way to get back to my orphaned checkins (luckily I had the terminal window open still, so I checked it out and branched). How can I get GIT to ...
Before I start, the following is based on knowledge gained through usage of TortoiseSVN 1.6.x and ASP.NET web projects with Visual Studio 2008 as example. Case Study Say, in a happy day scenario, a typical subversion repository structure can be somewhere similar to: /trunk /Solution1 /ProjectA /ProjectB /Pr...
I've got a project which is built using Maven and Continuum. We've got several release branches, most of which are in retirement but any could conceivably be resurrected if an issue comes up. My problem is that adding branches to Continuum is very heavyweight; the best method I've found so far is to add each branch as a separate projec...
I've been searching around here for to look for an answer and it seems I may just be making incorrect assumptions on how git branches are supposed to work. I have my master branch and I've created a feature branch called profiles where I'm doing some specific work to profiles. While working on profiles I've changed 5 or 6 files and adde...
Note: I am not sure whether this has been already asked, as I can't find any question fitting to my context(or I am unable to understand the existing questions' contexts') I am loving Git these days. Especially, the topic branches. I am working on a small code sharing application. And I have got (local)branches like "master", "authentic...
Branching sources for release cycle is one of common source management scenarios. Merging as soon as possible is a good practice. Thus we have a human factor: branch is closed, but someone forgot to merge something back to trunk. Q: Is there a "one click" way to get all revision numbers that were not merged from branch X to trunk? (Not...
How can I get a list of branches that are first-level descendants of the current HEAD? I can get a list of the whole tree with: git log --graph --abbrev-commit --pretty=decorate --branches which gives * 2eff4a7... (refs/heads/issue-8351) Added a factory factory factory. * 2e387aa... Refactored all of the factory factories. | * b3fad...
I'd like see a visual diff of a branched file. So I do this p4 diff2 -b branchname main.cpp One problem... it's not visual and external diff isn't supported. http://www.perforce.com/perforce/doc.current/manuals/cmdref/diff2.html p4 diff2 does not use the diff program specified by the environment variable P4DIFF. The diff algorithm ...
Hi, I've got a named branch (same repository) that was created in order to to spike something. I've now decided that I want to move all the changesets created in the branch back into the main (default) and then close the branch. I've tried a number of different things, including what was outlined in this post (http://stackoverflow.co...
Hi, I want to move a changeset from one branch to another. Basically, I currently have: A -> B -> C -> D # default branch And I want: A # default branch \-> B -> C -> D # some_new_branch Where some_new_branch does not exist yet. I am used to git, so I guess there is a simple "mercurial" way I am missing. ...
Hi, I am using TortoiseSVN for my C++ project, and am trying to "reintegrate a branch" back into the trunk. My case is simple enough so that for every file which has changed in the branch, I would like it to completely overwrite the matchinf file in the trunk. Unfortunately, TortoiseSVN is smarter than me, so it merges each pair of fil...
I have a branch that I'd like to move into a separate Git repository, and ideally keep that branch's history in the process. So far I've been looking at git filter-branch, but I can't make out whether it can do what I want to do. How do I extract a Git branch out into its own repository? ...