version-control

Is it possible to import files from one SVN repository to another using TortoiseSVN?

I have several separate SVN repositories locally on my machine and I use only the TortoiseSVN client functionality without an SVN server backend. Now I want to merge these repositories while keeping the revision history of individual files. Is that possible with with TortoiseSVN alone or even SVN? Edit: It seems like what I want to acc...

Git: How to stash only one file out of multiple files that have changed

Hi, How can I stash only one file out of multiple files which are on my branch, is there a way to do so ? Thanks. ...

What combination of project-management software will meet my just-started project's needs?

Hello all, I have a got couple of software projects that I want to run with my friends(max 10 persons) privately(at least for now). But I'm kind of lost between software management systems. I am not even sure about the definitions of my needs. Dear all, what is the definition/name of the system/software that meets my needs listed below? ...

Mercurial: How to set it up on my own server?

I've got a server and I want to use Mercurial to coordinate a project. Can I just make a repo, put it on the server, and have everyone else clone it, then push/pull from it? Is there some way to password protect it? ...

perforce connect history of two different files

Hi everyone! I have a problem, in a refactoring attempt I have copied files from one place to another and added them in my scm (perforce). When I was done and everything was working I deleted the old (moved) files. Can I connect the file histories with each other? The best would be to se the "move" like it should have been done.. Than...

ClearCase won't allow Check-In

I'm rather new to ClearCase but have searched through a lot of solutions to the following problem without success. When I try to do a check-in I get the following error. Error checking in 'MY FILE' No premission to perform operation "checkin" Must be one of: object creator, element owner, VOB owner, member of ClearCase grop Unable to c...

How can I see the entire SCM history in my Xcode project?

If I look at the SCM tab in Get Info for my project I only see the commits that affected the project file. Where can I get a list of all the commits for the entire project? ...

Synchronizing an ERWin model with a Visual Studio 2008 GDR 2/2010 db project

I am looking for options to get our vast collection of DB objects across many DBs into source control (TFS 2010). Once we succeed here, we will work toward generating our alter scripts for a particular DB change via TFS build. The problem is, our data architecture group is responsible for maintaining the DB objects (excluding SPs), and ...

Delphi 2010: how to stamp file version in *.pas and increment it on each save w/o CVS/SVN tools?

Hello. How do I have in each *.pas file it's version, incrementing on each save in some comment line? I have plenty of files on three PCs and I need to have a possibility to quickly check their versions against each other. This problem is easily solved by some centralized version control, but some sources I have cannot be trusted to e...

Maintaining 3rd party Libs

Suppose I have a project under my own version control. Then I want to make some changes to a 3rd party lib, so I want to put that lib's source in my project somewhere to be under my version control with the rest of the project. However, the 3rd party lib is maintained somewhere else on another version control software system. Because I a...

Distributed version control systems merge easiness details

I have just read Joel's blogpost concerning distributed version control systems and can't understand the main idea. He says that SVN thinks in terms of versions while Mercurial thinks in terms of changes. And, according to Joel, it solves merging problems. I heard this idea several times and still haven't conceived it. As I know, SVN's ...

Remove commits before specific commit

Hi, is there a way to remove all commits before a specified commit and use that commit as the initial? Regards, Erik ...

How well do (D)VCS cooperate with workflows involving several people editing files in the same directory?

Imagine because of tradition that your team's preferred development method involved several people with a shared login, editing files on a build server using vim. [Note that there are well known issues to do with only one person being able to edit a file at once, people going away from their desk and leaving the file locked in vim, syst...

Why does Visual Studio 2008 try to open a project from the wrong folder?

I'm having a bizarre problem with Visual Studio 2008. I wanted to debug one of the libraries that my web application references. Therefore, I decide to add the project containing the library to my solution so that I can debug them together. The project containing my library sits at c:\webLibs\myproj.vbproj. However, when I try to add...

What is the 'standard' content of .gitignore for an iPhone (Xcode) project?

What is considered the 'standard' content of .gitignore file for an iPhone (Xcode) project? PS: not sure if this needs to be a CW. ...

Visual Studio Check-in Option Changed to "Check In Now"

When checking in files using VS 2008, I normally have the option "Check In ..." Recently, this has changed to "Check In Now" and the behavior is different (I'm not given the option to add a note with my check-in). This is bizarre, as I can't think of anything I've done to change the IDE. Does anybody know how I can get back to the "Chec...

Is there an encrypted version control system?

I am looking for an encrypted version control system . Basically I would like to Have all files encrypted locally before sending to the server. The server should never receive any file or data unencrypted. Every other feature should work pretty much the same way as SVN or CVS does today. Can anyone recommend something like this? I ...

Is it better to comment out unneeded code or delete it?

Possible Duplicate: Do you leave historical code commented out in classes that you update? For web applications under maintenance, assuming you have source control, when you need to remove part of the UI and the associated code, do you delete the code and check in, or do you comment out the old code? Arguments in favor of del...

What's a good way of managing A/B testing-related source?

The current method employed at our company is to have a long-lived release branch that we all develop on, with developers checking in any non-ab test code into both the branch as well as the trunk, while ab test code only gets checked into the branch. Then, once we release, winning test cells get merged into the trunk, while the majorit...

What's the best git installation structure for a one man shop?

I am trying to implement a version control system for my web apps/sites. I am currently working on 3 different machines (2 win and 1 osx) all of which have Dropbox installed. Inside dropbox I have all my webapp projects in a 'websites' folder. This effectively creates a backup of my source code and syncs all 3 computers. However my curre...