Hi all I created a custom project skeleton as a start for my django projects, hosted on a public repo at github. Id like to use this as root folder for my new, public and privates projects, also hosted @github. The problem is i cannot use this one as a submodule because as fas ar i know i cannot add submodules inside another submodule...
In my deploy.rb for Capistriano I have the following: set :branch, "2.3.5" but Capistriano insists on checkout out deploy. Any ideas why and/or how to fix it? I'm using git as the SCM: set :application, "Example" set :repository, "[email protected]:example/example.git" set :scm, :git set :deploy_to, "/var/www/example.com/" set :branch,...
I am having problems with our merge tool as sometimes it fails to match the unchanged blocks in the two branches correctly. When this occurs the merge tool becomes useless, and the merge has to be done by hand. Therefore I am looking for a tool that: Understand what VB.NET function/method definitions looks like and gives them a h...
When a simple refactoring like “rename field” has been done on one branch it can be very hard to merge the changes into the other branches. (Extract method is much harder as the merge tools don’t seem to match the unchanged blocks well) Now in my dreams, I am thinking of a tool that can record (or work out) what well defined refactorin...
I've finished working on a feature branch feature-x. I want to merge results back to the default branch and close featrure-xh in order to get rid of it in the output of hg branches. I came up with the following scenario, but it has some issues: $ hg up default $ hg merge feature-x $ hg ci -m merge $ hg up feature-x $ hg ci -m 'Closed b...
Is there a way to determine when a git branch was created? I have a branch in my repo & and I don't remember creating it... thought maybe seeing the creation timestamp will jog my memory. ...
I have this (git repo): A--B--C--D ->master \--E ->dev And I want to bring only commit D to branch dev (D doesn't depend on C), so that: A--B--C--D ->master \--E--D' ->dev But D' shouldn't get added to master after a merge: A--B--C--D--E' ->master \--E--D'/ ->dev This is because I want to bring only a file update ...
I have 3 files that are always producing merge conflicts when I am trying to merge between the baseline and my development branch in either direction. When the merge tool opens, there are no conflicts in the files and I just click ok. But it will happen again next time I merge. What can I do to get TFS to realize that NOTHING HAS CHANGE...
Is there a specific rule I should be using for when to branch in source control? Branches seem to be expensive because they require that the team have extra knowledge about where the features they want to work on should go. Our development team sometimes finds itself working on a long term feature and a shorter term feature at the same ...
I have a problem with a SVN branch. I made a checkout of it with git checkout -t -b stable svn/stable. Then I did a merge with git rebase master. After that I tried to commit the merge changes into the remote branch with git svn dcommit But now it seems, that Git pushed the changes into the trunk instead of the branch :( And git status...
I read SO nearly everyday and mostly there is a thread about source control. I have a few questions. I am going to use SVN as example. 1) There is a team (small, large dosnt matter). In the morning everyone checks out the code to start working. At noon Person A commits, while person B still works on it. What happens when person B commi...
Hi. I would like to merge from FeatureBranch to master, without doing ,,checkout master'' first. I've tried (being in FeatureBranch) git push . master but I got (to a degree of surprise) : Everything up-to-date Despite having commits in FeatureBranch which are not (yet) present in master. The reasons why I desire to be able to do...
I check my code into a GIT branch every few minutes or so, and the comments end up being things like "Everything broken starting again" and other absurdities. Then every few minutes/hours/days I do a serious checkin with a real comment like, "Fixed bug #22.55, 3rd time." How can I separate these two concepts? I would like to be able to ...
Hi guys: I'd like to understand when creating a branch, SVN just make a entire copy from trunk or make use of some mechanism to achieve it? Thanks. ...
Hello, My situation: I've recently joined on the front-end side of an established project that involves a growing number of instances of a rails app, each of which which differ in some aspects (views, styling, settings etc) but which all share the majority of their back end code. Our Git repo has a number of branches looks something l...
Consider a simple source-control layout, with a trunk representing a future release in development and a single branch representing a release currently in production. When a bug is discovered that needs fixed in both branches, should the change be made first to the trunk then merged down to the branch, or made first to the branch then...
I need to cut a release of our software based on the latest revision of our svn repository. But there is a set of changes that we don't want - 20 or so files that were edited a month ago and then committed all at once. I made a branch called 4.3.x from the trunk, containing all the changes we want and the 20 or so that we don't want. No...
We have a framework created in .NET which controls hardware devices. The entire framework uses MEF so it relies heavily on interfaces. For reasons beyond our control we had to change the hardware and that required some breaking changes to some of the interfaces. The project for the old hardware was put on hold for a while and we starte...
I use git to maintain multiple working copies of my code. The idea is that I can check out any branch, build and run it to see how the branch's feature x fits in with the current state of the code. Git's master branch is the Trunk and the other git branches are features or things I would like to try out. Therefore, my typical usage is ...
Hi, Following action only creat branch from head revision of the trunk.How to create branch from a specified revision? Thanks. $ svn copy http://svn.example.com/repos/calc/trunk \ http://svn.example.com/repos/calc/branches/my-calc-branch \ -m "Creating a private branch of /calc/trunk." ...