Find find git docs very cryptic regarding this issue. I want to do a simple thing, but it seems doing it is not simple at all. I have the following situation: $ git remote -v origin git://192.168.0.49/mnt/repos stick /mnt/titanium/podaci/repos I can use git pull to fetch and merge from origin, and that works fine: $ git pull Alr...
Hi there! I'm currently working in a web application development. Our company methodology is to work on the project trunk for as long as possible and switch to the branches only when necessary. However, in order to guarantee the success of a recent deploy, I have worked directly on the client specific branch. I would like to know how c...
I'm currently reorganising our TFS source control for a very large set of solutions, and I've done this successfully so far. I have a problem at the moment where I need to delete a legacy "Release Branch" TFS project that was branched for the old structure, and is no-longer required since I now host a release branch within the new struc...
All, currently I have following maven projects all stored in svn: Common-Test v1.0 -> svn:repo/Common-Test/trunk Common-Core v3.1 (depends on 1) -> svn:repo/Common-Core/trunk PM-Web v3.1 (depends on 2) -> svn:repo/PM-Web/trunk Now, I need to create a branch since v3.1 is installed in p...
In GIT, what does DELETION of a branch mean? Will it be gone from the repository? Or will it still be navigable to via git branch What I really want to do is mark a branch as DEAD END, i.e. the branch is so far from master, that nobody should use it as a starting point, though there were some good ideas down that branch, so we'd like ...
My team's just starting out with Mercurial and a central repository. We have Hudson building the tip of the "default" branch - which is basically our mainline. We had a check-in policy with our old VCS that code reviews, testing, etc. must be done before you check-in to the mainline. So, let's say you are working on feature X. You wo...
So my team is just starting to use branches on our project, and we've run into an organizational issue concerning the way Eclipse/CVS handle branches and projects. My question is this: Is it possible to ensure that multiple projects are always synched to the same branch with CVS in Eclipse? Here's a simplified scenario: Two projects: ...
I'm using git. I have a branch, apifixes, that was branched from master some time ago. Most, but not all, of the changes from the apifixes branch have been merged back into master. At least, I believe this is the case, because when I try to do git branch -d apifixes I get the following error: error: The branch 'apifixes' is not an...
Hi. We are reaching a point in our project where we need to make a production deployment but also need to have ongoing development for future features. Our source control currently has a single development branch. In my previous company a 3 branch system was set up with Development, Integration, Production. Feature development was done ...
We are using TortoiseSVN in a team environment. When working on a bigger feature, I create a feature branch, work for a week there, merge changes from trunk to my branch every other day and when the feature is complete, I merge it back to trunk. When merging, I always do the following: commit everything to the branch switch the whole ...
Is there a way to associate a bunch of Mercurial changesets with a named branch after they have been committed, i.e. retroactively ? ...
I am trying to grok Mercurial and hope I am just getting confused here! I have a repository ('main') that I have cloned ('clone'), , both on my own machine. Both were completely in sync with each other. I decided to play with named branches so the next time I committed on my 'clone' I did it under a branch name of 'case1212' and while ...
I suppose I'd better explain my situation: I'm in the process of developing some software, and I'm at the stage where I'd like to split my project into two branches which differ in features. It so happens that this application is an Android application which I will be deploying on the Market, which has the constraint that every app must...
I probably just haven't thought this through, or perhaps I'm simply unaware of an already existing option in Subversion (I'm certainly no expert). I'm just wondering, if I've created a branch to start working on some new feature, if there's an easier way to keep the branch up to date with the trunk's most recent revisions without having...
I made a bunch of commits to the master and realized after the fact that they should have been in a branch. I've looked at various things about rebasing and merging and resetting the master. But no attempts at manipulation have yielded a history that looks like what I'm trying to do. My attempts lead me to believe it requires some comb...
Background: Swip was working on a test project solely for the purpose of trying out git. This is a local one-person repository that has not been shared so swip did a reset hard in order to obliterate some unwanted commits: :git reset --hard 6aa32cfecf4 HEAD is now at 6aa32cf auto commit Sun Feb 28 16:00:10 -0800 2010 Then swip...
Hi, I have a git repository (at github.com) with two branches: master and gh-pages. I would like to have the gh-pages branch in a subdirectory, so that I don't need to switch branches every time. repo/ (content of the master branch) gh-pages/ (content of the gh-pages branch) Is that possible ? ...
Hi, I used Visual SVN Manager to create a repository, but I didn't create /trunk /branches and /tags at first. Now, I NEED to add these since the project has grown up ==> branching and merging is essential! What is the best way to do so ? ...
Using Subversion, in my working copy I make a minor modification (update a version number). I would then like to tag my working copy. Would this tag still be a cheap copy with the modification, or would SVN duplicate the files? I would hate to see my repository grow enormously in size because I'm trying to save a version number change...
I have a need to create a library of Object Oriented PHP code that will see much reuse and aspires to be highly flexible and modular. Because of its independent nature I would like it to exist as its own SVN project. I would like to be able to create a new web project, save it in SVN as its own separate project, and include within it t...