I've been getting familiar with creating, merging and deleting branches. I like to know where I am so I don't commit work into the wrong branch. I use git branch -a to see which branches I have. I think the asterix * shows which branch I'm currently on. What does it mean when I get: * (no branch) master origin/HEAD Because when I ...
I am having problems using IvyDE when I have different workspaces for different branches. I have "Resolve dependencies in workspace" switched on. But everytime I change to a different workspace I have to remember to manually clean the caches out. This is because IvyDE always uses the default cache for resolving dependencies within a w...
I have a subversion repository with a directory structure: frontend backend + a + b In a other branch, someone had put the sub-folders a and b in the root directory and delete the other stuff (frontend, backend). a b Now i have to merge this branch back into the trunk (backend-folder). How can I do that to dont lose the history...
We created a branch from the trunk on which a major refactoring was done. Meanwhile, the trunk advanced a few revisions with some fixes. We don't want these changes on the branch, so we don't want to "catch-up" merge the trunk to the branch, because we don't want to mix the old and new code. But without this I can't reintegrate the branc...
I need to create a branch at a specific Changeset in TFS. Is this doable? For example, I have changeset 1528 that was the last check in on my project. But I want to branch from changeset 1487. Can this be done? If so, how? Note: I am using TFS 2008 ...
I had a boss, past-tense, who decided to put svn branches in the same folder as trunk. Normally, this wouldn't affect me that much but since I'm using git-svn things are going so well. After I did a fetch it created a folder for each branch in my root folder so I have three folders, drupal, trunk, and client. The drupal folder is git's m...
I like creating named branches in Mercurial to deal with features that might take a while to code, so when I push I do a hg push -r default to insure I'm only pushing changes to the default branch. However, it is a pain to have to remember -r default every since time I do do a push or outgoing command. So I tried fix this by adding this...
is this possible with Mercurial? and which Version Control system can do this besides Clearcase? ...
I'm pretty new to Git, and like it a lot so far, but am not sure what do do here. I've forked a github project, and am currently in the process of porting it to another language. For reference, I've created a branch of the code as it was when I made the fork. My problem now is that the original project has been updated, and I can't figu...
So I have a mercurial repository that is the "blessed" repository that I will have open release cycle branches, for example Release1, Release2 etc. When a dev is working on a release cycle they will pull down Release1, then on their local machine branch for Bug1, Bug2 and fix those. What command sequence needs to happen for the devs to...
I've been working on code checked out from the development line and discovered that the changes made might be breaking changes and need to be moved to an experimental branch before committing to the main dev tree. However, I don't have the experimental branch checked out and I don't want to loose the changes that have already been made. ...
I suspect I have corrupt mergeinfo but I'm not sure. Does anyone know how I'd make a determination and what resources are out there to help fix problems? Here’s the issue. My team recently moved to agile and uses feature branches (story branches really) where different teams work on the same sources concurrently. As the story achie...
Here we go again with svn:mergeinfo. I have read all the Q/A regarding it but I have come across a case that does not seem to be covered in the existing posts here. My trunk is clean of svn:mergeinfo, i.e. this: svn propget svn:mergeinfo --depth=infinity returns only merge info in the root of trunk, which is fine. The I create a branc...
Backround: Suppose I have the following Git URLs (hosted on github) http://github.com/mikl/drupal.git git://github.com/mikl/drupal.git (Git read-only) I am interested in having a local copy of this repository so I can pratice working with branches in git and see how my local working tree can change depending on which branch I am w...
I use TortoiseSVN and frequently switch between a branch and the trunk, using the switch command. I noticed that if I don't commit before the switch, local modified copy gets merged. Is there a way to customize the tool to, say, warn me to commit local changes before switch? ...
Question: What is the best practice for creating branches for development and release based on the information provided below? Background: I work in a small development team (2.25 frontend, 2 backend), and we have a yearly release schedule. Our environment does not allow for patches or services packs mid-year, but every once in a while...
hi there If I have n commits, how can I branch from the n-3 commit? I can see the hash of every commit. ...
I'm trying to understand why the below is occuring: It appears that I have started another branch, but it has no name, and I do not remember creating a new branch. Why did this new head(branch) get created? How do I keep it from happening? ...
In my gemfile I have this: gem "authlogic", :git => "git://github.com/odorcicd/authlogic.git", :branch => "rails3" How do I install that as a gem so I can test it? ...
Hi, Our distributed team (3 internal devs and 3+ external devs) use SVN to manage our codebase for a web site. We have a branch for each minor version (4.1.0, 4.1.1, 4.1.2, etc...). We have a trunk which we merge each version into when we do a release and publish to our site. An example of the problem we are having is thus: A new fea...