version-control

Eclipse: which files to store in version control for GWT project

I'm working on a GWT project in Eclipse with Mercurial for revision control. Which files should I store under version control? Or, perhaps more succinctly, which files should I not store since they are either part of GWT or are artifacts of the build process? I'm using Eclipse Helios and GWT 2.0.4. This question would apply to any vers...

Git vs Mercurial vs SVN

Possible Duplicates: For home projects, can Mercurial or Git (or other DVCS) provide more advantages over Subversion? What are the relative strengths and weaknesses of Git, Mercurial, and Bazaar? What are some of the differences between these source control system? Which one is the best for a small 2 people project? ...

Version control ignore list for google app engine Java apps

Is there a standard list of files/directories/pattens that can be added to a version control ignore list (e.g. .hgignore) when version controlling the source of a Google app engine Java app? I guess a bunch of people must have worked this out already, any good examples out there? ...

Using git and svn with multiple developers

I have a svn repository (with no TLB structure if it matters) which I want to use along with git. I can do a git-svn clone, work on my changes in the git repo and commit back to the svn repo whenever I am done. It's clear until this point. I'm not sure how to extend this workflow model to multiple developers. I need my dev team to be a...

Git: tracking only selected entries

I have a directory, in this directory I have many subdirectories. I want to track only 4 of them (I know they names). Many people have access to the top directory, and some of them, sometimes are adding new subdirectories. When I now list the status of the repo with the command git status I get a huge list of 'untracked' entries...

pushing to a git repository does not work

I am just starting out with GIT (i'm coming from cvs) and would like to set up something akin to cvs/svn with Git. I performed the following steps: cd o:/repository git init cd <working directory> git clone o:/repository i now created a file called file.txt with some content doing a "git status" lists appropriate changes. I then do...

Storing Umbraco settings on the file system and packaging changes for deployment

Does anybody know of an easy way to store Umbraco settings (Document Types, Media Types etc) on the file system in order to manage that data within source control? Note: changes to settings made on the file system need to be easily integrated back into the CMS database. Also, does anybody know of a way to package up settings from a dev...

How do you manage multiple versions of the same software for each customer ?

Hello, I have a source code 95% the same for all customers. Some customers ask something specific. How can I manage this, if it possible with VisualSVN/Subversion ? Could you tell me how manage this kind request ? Thanks, Update1: Some precision about the applicatio , it's a web ASP.NET MVC with NHibernate. The appliucation has severa...

How do I add project-specific information to the Git commit comment?

With Git, if you are committing, it includes a section under the commit message that is commented out. This contains instructions on writing a commit message as well as a list of files that are changing. Like this: # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts ...

renaming repository folder

When I rename my repository folder in Nautilus, Bazaar can't open it any longer. In All Commands, there is a renames command, but it's not what I want. Bazaar claims to have the best renaming, so in the other VCSs, is everything unrenameable? What's going on? How do I rename my repository folder? ...

Commit Early Commit Often With Code Reviews?

Hi, I'm looking for advice/experience/best-practices on how to get a team of developers engaged in a commit early commit often work paradigm while still benefitting from a thorough code review process. We currently use review board and it is policy that no code be committed to SCM w/o a peer review. While I completely embrace code revie...

revision vs. version

I am kicking off some process improvements at a new company. One of the areas to concentrate on first is CM. I was asked during a briefing of what I am doing what is the difference between revision and version. I gave my explanation and then followed up with an email of the following link: http://www.product-lifecycle-management.com/...

Git cancel a revert

Hi, In git let say I commit A and B A---[B] But then I revet with git revert HEAD So I am there now: [A]---B How do I cancel my revert so that I can go back to B? Thanks ...

Using git properly

I have been reading up and trying Git for the last few days and I have one more thing that i can't seem to find good information on. I read that with Git it's common to set up a public and a private repository clone on each developer's machine that way the developer can do private commits as many times as he/she wants and then only push...

How to compare two revisions in Mercurial?

I need to know what files have been added/modified/removed between two revisions. What I do: hg status --rev 10:11 It looks okay. But when I have only one revision (initial = 0) it doesn't work. # not work hg status --rev 0:0 # also not work as I want hg status --rev 0 There is no revision -1. ...

Mercurial - How did my commit get split off (see pic)?

What's going on with the line that split out on it's own? I did a commit and then I did a pull for the repository and then an update. What caused this? How do I get that split part back into the main line? ...

Managing internal 3rd Party Dependencies

We have a lot of different solutions/projects which are managed by different teams. Our solution needs to reference several projects that another team owns. We don't want to add these dependencies as project references because we do not intend on modifying that code, we just want to use it. Also we already have quite a bit of projects in...

java - is it possible to choose version number when compile a file?

I've wrote a java code and compiled it. (foo1.6.class) According to my search, my local machine has Java 1.6, and the tomcat server that I uploaded foo1.6.class only accepts version number 1.5 This means that I have to have Java 1.5 to compile? I believe it is the cause that bad version number error is thrown like below. My question is...

Mac source control option with both working and live repositories being remote?

I've been doing LAMP development for roughly ten years now. I've occasionally used CVS and SVN. I code mostly with BBEdit. I am trying to setup some sort of source control to manage LAMP web apps. I prefer not to have a local repository. I usually have a dev server and a live server. I am looking for a source control option that will wo...

What is the cleverest use of source repository that you have ever seen?

This actually stems from on my earlier question where one of the answers made me wonder how people are using the scm/repository in different ways for development. ...