Hey, I have been working on a branch which we can call "A". I just realized that the code I have added since I last committed should rather be in a specific (experimental) branch, but not in "A". How can I commit the changes to a new branch and leave branch "A" as it was when I last committed? ...
Suppose I have tagged the release version of our project under $SVNROOT/project/tags/1.0. Suppose now that I need to create a branch from that tag, mark it as being a SNAPSHOT, and update the scm configuration. I tried with the release:prepare goal thus: $ svn co $SVNROOT/project/tags/1.0 project-1.0 $ cd project-1.0 $ mvn release:bran...
I started a feature branch B from branch A. Then I made some changes in both. Merging A into B and then B into A results in both heads pointing at the same merged commit (which is what I wanted because changes in A should also affect branch B). Now for a while only A will experience changes. Is there a way to make B stick to A until I c...
Hi guys, I've been working in a git branch on one portion of a rails site. I've made a lot of random changes to the schema while iterating, and I've made some migrations that revert previous migrations to add columns and things like that. Is it OK to delete redundant migrations like those (i.e. pairs of migrations that are just reverses...
Well, till now, I used common git operations like push, pull, commit and clone. But now, I need a git repo with different branches to test certain features but all these features require the same library which should be included in the repo. What's the best pratice to do this? ...
I really can't figure it out. I'm new to Mercurial and TortoiseHg. Read alot of docs and still cant find answer. I know that one way of branching is making a copy. Thats clear but there is another way called "named branches" but this is one thing i can't understand. For example i I have new repo first branch is called "default". Then i ...
A little background, because this might be kind of confusing: the project I'm working on is one where most of the code is the same, but there are some files that change based on the platform we're deploying to. For this, the root folder has all of the "core" files that don't change, and then there is a directory for each platform with t...
Hi, I am currently building an MVVM based application. The application should also have a wizard in MVVM style. The wizard is not a normal wizard, its a particular kind of a wizard. My goal is to implement a wizard with 1.) has also multiple branches. The wizard can guide you in other direction. So the wizard must not be straightforwar...
I came to git via terminal, not github and I am wondering how I make a connection between the two. From a checkout I have, I created a branch in terminal by running this command: git checkout -b newbranchname From my understanding, github calls this forking. How do I connect the branch on my box to a fork of a checkout on github? (...
Hi, a few months ago i configured a git with an svn repository. Until now i only used the svn repository to keep up-to-date with the supplied application on it. But now i also want to commit stuff back. To do this every feature i'm going to commit needs to be in a separate branch. I read about how you should create a new branch etc. But ...
Hello, I'm in a situation where I don't want to commit my current changes to the trunk. I would like to commit to a private branch and work there a little until I'm sure that everything is OK. I will merge changes made in my branch to the trunk. What is the recommended procedure when you use SubVersion and TortoiseSVN ? I have the cl...
I am working on some bugs in our code base and I have created separate branches for each bug. I have rebased one of the branches on top of default. I generally use the mercurial plugin for Eclipse and I would do a push (when I am in the default branch). This pushes my changes on the default branch. I tried to do the same thing with Tort...
I've cloned the Official GCC git repository, which includes a full GCC development history, but git branch -r lists only a few recent branches, and 'git tag' reports no tag. git fetch --tags didn't help. git svn fetch will recreate tags/branches that were in SVN, but will take about 10 days to complete. I know I could use SVN directly...
I am trying to understand a project, it helps to look at its evolution by using gitk. What I do is checkout the first commit, understand code, run tests, go to next commit and repeat. My current workflow is to checkout the commit through its hash git checkout 79cd6 But what I would like is another branch where I can perform my own ch...
I have two branch (let say branch A and branch B)in my svn repository I'm done with one of them, branch B I want to get changes of the other branch ,branch A. On both branch i have binary files,in a separated folder. When i try to get the new binary files of branch A, i get nothing, just tree conflict. I use subclipse, merge a range of ...
I am trying to merge a Branch to Trunk using the TSVN 'Reintegrate a branch' feature. However I get the following error. Error: Retrieval of mergeinfo unsupported by 'svn://IP.Address'? What is the reason for this error? Also is there some other way to merge the Branch to the Trunk. ...
Per this old thread, using svn 1.5, reintegrating a branch multiple times is problematic, and should be avoided. There has been some rumbling to the effect that, "This is a known issue, and should be fixed in svn 1.6." Does anyone know whether that was the case? Is it fixed? Can I reintegrate multiple times? ...
Similar to this question, how can I make an existing Git branch track a remote SVN branch? I often find that I start work in a local branch that I then need to push to an SVN server. Is this possible? ...
As a Git user, I find it inconvenient to set up multiple directories for multiple Mercurial remote repositories, as I want to quickly switch between them, especially when working in an IDE. I'm trying to somehow replicate the remote branches system from git, where I can simply switch between branches and push to the one I choose. How c...
I've been happily using heroku to beta test a Rails app, and recently hit a snag. I prefer Mercurial to git and have been using hg-git to push my app to Heroku. This was working fine until I branched my repo (doing a branch by cloning in kiln, if that matters). My folder structure used to look like this: ~/Code/MyApp And is now: ~/Co...