version-control

Is there a notepad++ with github plugin ?

I see that there is a subversion plugin for npp, but I didn't see anything similar for github. Is there one? And if not, what strategy could you offer to using the two? (In case I see the answer is no, I will turn this question into a community wiki) ...

Resolving a Grails project's plugins' paths/dependencies

I haven't really done much on this side of project development so please forgive the ignorance. We use SpringSource Tool Suite (STS) and commit ("promote") our codes to a version controller (Accurev). Thing is, we didn't promote our .classpath and .project after the first time to the repository (due to hardcoded paths inserted by the ID...

Is there a way to have Eclipse automatically detect and import/delete projects in workspace?

I have a Mercurial repository with a lot of projects and a lot of branches in it. Some branches do not contain some of those projects (because they branched before those projects were created) and some branches contain extra projects. Consequently, if I do a switch from branch A to branch B, I sometimes end up with some projects "closed...

Serving multiple repos with hg serve. How?

The wiki mentions it's possible to do this under hg serve, but there aren't any examples (such as a sample webdir-conf file). Yes I know it would be better to do this all under Apache, but this is a local machine and hg serve just makes sense for us. ...

How do I use NetBeans and SVN @version tag in the PhpDoc docblock?

I use NetBeans as my php ide and I have seen @version tags in the docblock that look like this: @version $Id someinfo and timestamp Does NetBeans have a way to automatically update this with each commit? Or am I missing the point entirely of this tag? ...

looking for a web based file mgr, workflow (open source) app

hey guys. working on a project, that will involve 100s of files that go through a development/review/test workflow process. (knowledgetree is too large/bloated..) the developer checks the file out/in, where the reviewer then reviews (accepts/denies) the file which passes it to the next phase where it's tested and again (accept/deny). i...

Mercurial commit messages from local to central repository

I recently started using Mercurial and like the way I have VCS protection for my individual development without checking it in to the central repository, then I push to the central repo when I have something ready for the rest of the team. When I "hg commit" I write a commit message relevant to the addition since the last time I committ...

symfony database access configuration problem

Hi all, I just joined a web dev project that uses Symfony 1.4 on CentOS 5.4 with MySQL. The server is down. My first task in the project is to get it back up. I don't know a lot about Symfony. The Apache server log says Access denied for user 'root'@'localhost' (using password: NO) From all I can tell, the database access configuratio...

What Perforce (p4) command lists the files in a given changelist?

What Perforce p4 command lists the files changed in a given changelist? Note that I want only the names of the files that have changed and not the content differences. ...

Resolving conflicts in git version control

I've got a big problem but I bet it's easy to solve. I'm developing a website together with a friend using GiT for versioning control. We've just modified different parts of the same CSS file and then commited, then he pushed his commit. We're both using master branches in local and remote repository for we don't know how to deal with it...

git clone with different file permissions

On our server are three (in reality: thousands of) text files stored in a bare git repository: A.txt, B.txt, C.txt. User "admin" should view/edit them all. User "Foo" should view/edit "A.txt" and "B.txt" but he is not allowed to see the content of "C.txt". User "guest" should only be allowed to view/edit "A.txt". All three users sho...

Hudson -- pulling source from multiple version control systems

I want to create a new hudson job that pulls sources from two version control system cvs and svn. Is this possible. I dont want to move from cvs stuff to svn, because we will soon be moving to git. suggestions? ...

WebReference and Source Control

I have a C# application that uses several web services which were added to my project as web references. I want to know what files i should check into source control. in my project there is a folder structure from my project directory that looks like this: Project Web References WS WS.wsdl Reference...

How can I sync my custom CodePlex Mercurial fork against the main trunk?

Hi folks, I've made a fork of some codeplex project. Done some extra code, etc and have even pulled my custom code into the source control repo. In those few weeks and months since i was working on my own fork, their main trunk has been updated. how can i sync my code with that of the trunk? (the main reason for me wanting to sync my...

How would you plan for merging multiple branches?

I've recently joined a team with a code base which hasn't been under version control. The code has been forked several times by different people in the organisation working on different projects. Now we're going to start using version control and we want to merge the valuable contributions from the different projects. The projects share ...

How to create a Visual Source Safe branch using NAnt

Summary I currently have a NAnt build script that performs a vssget on either the latest source code, or a specific branch (using a ${branch} parameter). Whenever we do a production build/deployment the code-tree that was built has a branch created, (so that we can continue development and still know what codebase is on production, pret...

Subversion on Windows Server 2008

(I'm Subversion noob) and we are planning to set up a single Subversion repository into a Windows Server 2008 (Terminal Server). We're have many client computers under the same domain. How to access this single repository? Should we install TortoiseSVN to these client computers? Can TortoiseSVN access easily this single repository (locat...

Whats the difference between git reset --mixed and --soft?

I am looking to split a commit up and not sure which reset option to use. I was looking at the page that has a promising title, but I realized I don't really understand what the git index or staging area is and thus the explanations didn't help. Also the use cases for --mixed and --soft look the same to me in that answer (when you want...

How to commit after removing a directory from GIT

Several posts talk about removing a file or directory from GIT - but they don't go as far as explaining how to PUSH those changes into the main repository. For example, this works just fine to remove the directory but when I try to PUSH this change to the main Git repo, I am denied: ! [rejected] master -> master (non-fast forwar...

Keeping git remote the same as local repository.

So, i decided to try git as my first vcs. There's actually no serious need(i'm a single developer of the project), just for self-education. I can't find out, how do you properly keep remote up-to-date. Do I really need to rm each file I delete at he local, to delete it from remote? Can it just look which files are missing at local repo a...