version-control

Why doesn't svn import work?

I have subversion setup on Mac OS X 10.5.6. When I do svn import myproject file:///library/subversion/myproject/trunk -m "initial import" Committed revision 2. Nothing happens. I'm back at the command prompt and no files are imported. Any suggestions? ...

Get Emacs to ignore *.orig files

I end up having a bunch of *.orig files sitting around, from hg reverts. It's annoying when I find myself editing foo.c.orig instead of foo.c by mistake. (I use ido-mode and the first match is not always the shortest.) Is there a way to tell Emacs to ignore *.orig files as though they were *~ files? I'm not having much luck with goog...

Looking for a Document Comparer that can generate difference reports.

I've been using an application called "WinMerge" lately for document comparisons, but one of the requirements of my teams script files (for auditing purposes) is that when we release a revision of a script we highlight the changes in red (RTF format I believe, it's through Lotus Notes) To that end, is there any software that can automat...

Why doesn't property have effect in ankhsvn?

I'm using Ankhsvn v2.0.6347.433 with VS.NET 2008. It all works fine. I've imported an .svnprops file from TotioseSVN. This is done in Windows Explorer by right clicking the root svn folder, selecting the Subversion tab, properties, and import. The import file filter starts off with svnprops. After importing, the commit dialogue now ...

Using Git, what's the best way to subtree merge an external project that has submodules?

I'm using a Git repository for everything related to a website I'm developing. The repository holds all files related to the site, including documentation, mockups, original layered images, etc. as well as the web root stuff that I've put in a www subdirectory. I'm at the point where I want to start integrating the CMS I've chosen to us...

git: how to insert a commit as the first, shifting all the others?

I've asked before about how to squash the first two commits in a git repository. While the solutions are rather interesting and not really as mind-warping as some other things in git, they're still a bit of the proverbial bag of hurt if you need to repeat the procedure many times along the development of your project. So, I'd rather g...

Reading a Git repository, without Git

Hello! I'm researching the idea of building a super-small (preferably PHP) web app, which will serve (among other things) as a minimal front-end to a git repository. Any library/article for reading a git repository (".git" folder) without having to execute the "git" process? I'm looking for an API to manage a git repository. I'm only i...

How to manage versions with Visual SourceSafe?

Hello, My team is working with VSS and we are having difficulties managing versions: We want to take a "snapshot" of the project we're working on, so we can keep working on it, but when we need to - we can get the files of the snapshot and built them for a release. (Is that called branching?) Alternatively, getting all project files by...

Source control alternatives to TortoiseSVN for a one man developer, only local usage

I've never used source control before (always used renaming files and other methods), so I was looking around for a relatively simple solution, to start me off with. I was looking for something simple with a GUI interface (along with a command line one) relatively used has books on the subject (most important) can take Word files along...

Good tutorials on code management?

I have been coding since a long time but I have never ever used the code management systems like CVS or SVN. Can you please suggest any guides which start from basics and then go with the concepts of the individual software and their intricacies. ...

Similar SVN Server software for OS X that's like Visual SVN

My design-house client needs version control to keep all their new source code I'm writing for them. Subversion seems like a good pick, All their servers are OSX. Does anyone know of a good OSX server manager for SVN similar to visual SVN for Windows? The reason i'm looking for one is because I get the feeling their IT guy is apprehen...

How do you make Git ignore files without using .gitignore?

Due to external weird constraints I cannot modify the .gitignore of my repository. Is there a way to ignore files and directories other than modifying a .gitignore? Even if it is a global solution like a global configuration that will be applied to all my repositories. ...

VS2008 TFS: Is it possible to change the default Check-in Action for work items?

When I check in code to our Team Foundation Server, I some times (probably more often than I actually do...) should associate my check-in with a task or a bug I am working towards. When I mark a task or a check in, it sets the Check-in Action to Resolve. But almost always, I just want to have it as just Associate. The result is that I of...

Advice on platforms/frameworks/languages/etc for a new project

I know this is not a programming question per se, but I wanted to get as much input from the SO community on a new project I hope to get started. The project is from being started from scratch and thus every decision for programming languages, databases, frameworks, platforms and what not are up in the air. I'm hoping to get your opini...

How to get revision number from subversion using maven?

I'd like to put revision number on main page of webapp, how can i do that using maven? P.S. Its two part question, how to get revision number and how to write it into selected file in the project. ...

SVN management on a project that uses absolute paths.

I've heard before that including project and workspace/solution files in source control is generally bad practice anyhow but I wanted to get feedback on the best way to handle this situation. My work has requested I set up a source control service for my department (which i've been asking for since day 1, 3 years ago). My biggest hurdl...

Ignoring Web.Config from source control without excluding from Project in VS 2008

I have a project I'm working on where I have a team that is located in two different locations. We are using a source control system that integrates with VS 2008. We have created a solution folder where we store different web.config files so the different locations can pick and choose which configuration they need to use to run the pro...

How do you get git to always pull from a specific branch?

I'm not a git master, but I have been working with it for some time now, with several different projects. In each project, I always git clone [repository] and from that point, can always git pull, so long as I don't have outstanding changes, of course. Recently, I had to revert to a previous branch, and did so with git checkout 4f82a29...

Using EnvDTE.Solution - How to Remove Source Control Bindings

How do I use the EnvDTE.Solution API to remove TFS source control bindings from the solution file? I know I can open the file in notepad and delete the GlobalSection portion, but I'm not sure if (or how) I can do this within the method below... public void Export(Solution solution, TemplateInput model) { if(model.RemoveSourceCont...

Visual SVN Specify URL with new port

Our SVN server was initially setup to run on port 443, we had to change it to run on port 8443 because it was causing conflicts with IIS. My question is how do I change the repository URL of all my projects to point to the new address? ...