version-control

How is Git Distributed Source Code Management?

I am a Git newbee with UNIX SCCS and Microsoft Visual SourceSafe experience. I’m just learning Git and it seems to have a huge and painful learning curve. I’ve already seen Git blow away all the data files I hadn’t committed, which concerns me. (How a utility can delete data files without warning is beyond me). Linus Torvalds, in his vi...

How to create a proper website?

Web developing isn't what it used to be. It used to consist of hacking together a few PHP scripts (I have nothing against PHP, actually it's currently my main programming language), uploading them via FTP to some webhost and that was that. Today, things are more complicated. As I can see by looking at a number of professional and modern ...

Git - Commit is ancestor of HEAD, but does not affect HEAD, and does not appear in gitk <path>

The file that's mystifying me is v5/employer/controllers/_employer.php. In the first image, you'll see that Brian changed the file in a commit on 14:55:47 called "time to commit stuff". But that commit's only child (second image), a merge operation Brian did at 14:56:45, does not show any changes to that file. But it's different! ...

Which is more user friendly: TortoiseGIT or TortoiseHG?

I have been experimenting with using Mercurial and TortoiseHG to track my work when I am working remotely (with a slow VPN I don't want to commit to SVN unless I have something that works). I have found TortoiseHG a bit hard to use - or at least it often doesn't work the way I expect it to, so I am considering switching to GIT and Tortoi...

How to add Stored Procedures to Version Control

Our team just experienced for the first time the hassle of not having version control for our DB. How can we add stored procedures at the very least to version control? The current system we're developing relies on SPs mainly. ...

git svn clone except a particular folder

I want to git clone an svn repository except for one folder in the root folder of svn. How do I do it? I could do git svn clone svnrepo/dir/sb-dir/ if I needed only sb-dir but I need all folders (and files) within the dir except the design folder ...

Calculated measure/dimension

I'm relatively new to MDX and am trying to accomplish what I think should be an easy thing, but I haven't found any solution. I have a sales cube and one of the measure is profit which can be negative or positive. I want to get one measure which is effectively the sum of positive profit, i.e. only include in the new measure those profit...

cvs - how do I find out if I need a new directory without `cvs up`?

I have written a shell script to show me what files need patching without actually doing a cvs up. It's just a simple cvs stat parser. But, it doesn't tell me if a new directory would come down with a new cvs up -d. Is there a way to find out if I'm missing directories that would be created with the next cvs up -d? ...

How do I diff 2 Perforce Client Specs

I have two perforce clients (client-a, client-b) that each contain about 40 file specs. They are similar, but each client has several file specs that aren't included in the other. I would like to find the differences between these client specs. Ideally, the output would look something like this... File specs in client-a and not in cl...

Are there any good desktop linux tools for viewing a bazaar branch's history?

For viewing diffs, I use the excellent Meld tool. But when it comes to looking at earlier revisions, I usually just find myself looking at the branch in Launchpad, where my code is hosted. Are there are good desktop tools for allowing me to do this? Ideally, Olive's "History Mode" should do the trick, but it just gives me errors when I t...

.NET MVC form versioning support

I'm building an MVC based system which should manage requests, thats is, a user of the system fills in a request form, the form is passed to some authority for handling and there might be many other proccessing to the form in the way. I want to be able to save History/Versions of the form, what i mean is, if a user fills in a form a yea...

How to develop an application which will be compatible for iPhone and iPod Touch 2.0 and above

Hi, I have a requirement of developing an application which will be compatible for iPhone and iPod Touch 2.0 and above. So I have number of questions. 1) Do I need to take care of all the deprecated methods and how? 2) I think there is no support for GPS/Camera before 2.2.1 so what is the best way to handle this using version below it...

Git Version Control - Views on Repositories?

I have a repositories, i want to have two "views": Developers can see the whole thing and customers should only see certain (tagged, or marked in another way) branches. I thought about making two repsoitories A and B and than list all not needed files as "ignored files" in B but I am not sure whether this will work. (I don't know whethe...

How do I convince my team to move from SVN to Mercurial?

The team I'm working with uses SVN for keeping version control. (It was used for years by them.) Recently I found Mercurial as a VCS and it looks much convenient for me than SVN. What arguments wound you suggest most convincing in order to move to Mercurial? ...

Are Subversion 1.6 & Xcode 3.2 compatible?

Trying to get Xcode to work with Subversion server. Server: Subversion upgraded to 1.6.9 (Mac OS X Leopard 10.5.8) Client: Xcode 3.2.1 (Snow Leopard 10.6.2 with Subversion 1.6.5 though not sure that matters) Repository on server is setup and working fine via command line. However, I get an error when trying to create the Repository...

Is Subversion more "supported" by continuous integration tools than Mercurial?

We are currently using NAnt on our build server, with CVS as our source control system. Seeing the need for improvements, we are investigating continuous integration tools and other source control systems. Subversion seems to be the most straightforward option to move on to from CVS, but a distributed version control system like Mercuri...

Background search for changes in TFS source control

SourceGear Vault's client app has the ability to background search for changes. This is very useful because at any time I can take a quick peek and see what changes my team members have checked in and that I need to get latest on. This is also helpful for previewing any merges that might be necessary. And on a day to day basis, it helps ...

Open working copy file from eclipse history view

The history view of eclipse shows you a list of files changed in a certain revision. When you open the context menu on one of these you have the option 'Open' which opens a view of that file in that revision. How can I open the editor for the selected file, i.e. the file in the version of the working copy, right from the history view? ...

Techniques to handle a private and public repository?

I have an open source'd website. Some content is "private" such as connection parameters, as well as files that the open source version doesn't need (eg. advertising templates). Essentially I'm trying to maintain two versions: A public site that has a unique identity (advertising, Google Analytics account, link for associated forum an...

subversion client for ruby?

is there are proper subversion client for ruby, that could be used to manage text files, images and other documents from a subversion project? it needs to be able to checkout the project, update and merge content (not automatically, but respond with a diff or something in case of a problem), commit, etc. please don't ask me how we got t...