I made an open source release based on a codebase which contained unfinished refactoring and other misc changes. Unfortunately it turned out to take a lot more work than expected and so now I am considering re-releasing the last stable codebase, and make a new branch that would contain any changes I did since. How would you go about tha...
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...
Hi, annoyingly I've just given up on setting up Subversion on my Centos web server, mainly due to the fact that the server has cPanel, which uses EasyApache, which in turn doesn't support DAV and makes it awkward to install and configure manually. So, I'm now looking at alternatives - Git seems to be the VCS of the moment, but I'm only a...
Is there a way to place the repository (.hg/) not in the same directory as the working copy? Like you can in Git by using GIT_DIR and GIT_WORK_TREE environment variables. Background: I want to use Mercurial to keep track of modifications in important directories on Linux and Solaris servers. But I want to avoid polluting delicate direc...
What is the simplest way to undo a particular commit that is: not in the head or HEAD Has been pushed to the remote. Because it is not the latest commit, git reset HEAD doesn't work. And because it has been pushed to a remote, git rebase -i and git rebase --onto will cause some problem in the remotes. More so, I don't wan...
Hello, I'm new to using Subversion and have just set up the following - SVN on a remote server and SVN on a local PC. I have created a repo on the remote server at /repos, then i (svn) imported a live website's files into that repo. I then checked out (using svn+ssh) a working copy to my local PC, directly into a local LAMP setup under /...
I m new to perforce, i want to know that it possible to checkin/check out file from different domain. ...
Git noob here. I know this is against the principal of "distributed source control" but I want to "password protect" certain development branches in my GIT repository. That is, I don't want that branch to be available via git branch -r, except to a certain group of developers who need access to that branch, via some sort of password. ...
I'm interested in hearing what other people do to understand/review code changes that were committed by other team members to a version control system. What processes do you have to make sure that everyone who needs to know about a revision is notified? How well does this system work for you (and your team)? FYI, we currently use ou...
To revert a particular folder in SVN to its previous state I currently use the following: svn rm folder svn commit -m 'removed folder to revert to previous version' svn co http://pathto/repo/folder@268 cd folder rm -rf .svn //recursively if many folders svn add folder svn commit -am 'reverted to the previous version' Seems too much tr...
Hi everybody. I have the following project setup: Solution A Project 1 (a lightweight component) Project 2 (contains a lot of files and depends on Project 1) Solution A is a single git repository. Then I created another solution and found that I could reuse and even update the functionality of Project 1. So my second solution would...
Rollback of an article I have deleted a lot of the body of this question because I realised I should rephrase it. Here it the rephrase: How can I implement something with strike throughs? Comparing one revision update to the previous. I don't want revision or version control per se, because I can just handle that in my mySQL database...
I created a topic branch from the master; made some commits. Then checked out the master; rebased it on the svn and merged the topic branch. There were no commits on the master itself, so the merge was fast-forward. Now, when I try to svn dcommit it gives me merge conflicts! wtf? Clearly there is a linear history on the master. The w...
Yea, right. I use git (with git-svn) on linux and a colleague uses svn on windows. So many times, git reports whitespace issues. In fact it fails to commit a linear history because of these problems and creates merge conflicts. What is the simplest way to configure svn/git and git-svn on windows and linux so that there are now whitesp...
So, I'm trying to checkout just the TestNG plugin from the Netbeans contrib repository. (Or is it module? I'm new to Mercurial, so I don't really know the lingo yet.) When I run the following command... hg clone http://hg.netbeans.org/main/contrib/ ...I get the entire repository, which contains all of the the contrib plug-ins. Is i...
Problem on WindowsXP (likely will happen on all Win installs), first time using Mercurial. I found the answer in an inobvious place so I'm asking/answering the question myself so others don't have to search like I did. First time using Mercurial on machine. Add new repoz: c:\bla\>hg add no problem. Next, commit: c:\bla\hg commit ...
I work with a team of several developers. We develop and maintain many different products which are related to our company. What are some good ways to share code that does common enterprise tasks such as logging, database access, XML handling, etc? We typically have several different versions of the same or similar classes/libraries...
I'm working for a web development company and we're thinking about using GitHub for version control. We work with several different .NET-based CMS-platforms and of course with a lot of different customers. We have a standard code base for each CMS which we start from when building a new site. We of course would like to maintain that an...
My team is taking over a project from a previous team. We use a different TFS server than the original team, and we are also not interested in keeping the history of the project because we are accepting the latest version of the code as the beginning of our history with the project. Branching is not an option since we want to start our...
With the new sparse checkout feature in Git 1.7.0, is it possible to just get the contents of a subdirectory like how you can in SVN? I found this example, but it preserves the full directory structure. Imagine that I just wanted the contents of the 'perl' directory, without an actual directory named 'perl'. -- EDIT -- Example: My git...