My company has 3 developers. Me, another guy, and a VP dev. I really want to implement source control, especially since our code seems to randomly change on it's own. We tend to develop on the server, live, etc. I'm fine with having a copy of our database on my machine to work against, if necessary, as is the other guy. The VP dev d...
I am working on a system that will have several hundred thousand XML files, ranging from 2K to 1MB in size. Does anyone have experience using version control with >300k files? Will SVN or git become problematic? I am familiar with SVN but have no experience with any other version control. EDIT: I have tried both SVN and git with 120,00...
I am looking to add an existing file tree to a git repository as a new branch (I can't just copy the existing tree into my git tree, since the existing tree is versioned under a different VCS, and I am trying to sync them up). Is this possible? EDIT: Would setting up a new git repository, that is connected to the existing remote reposi...
I get the following error when connecting XCode to a repository on GoogleCode.com Error: 175002 (RA layer request failed) Description: Server sent unexpected return value (405 Method Not Allowed) in response to OPTIONS request for 'http://touchcode.googlecode.com/hg' Has anyone see this before and how do I resolve it? ...
I'm a git newbie. I'm working on a project on GitHub, and I have some problems (I'll detail them in a later posts if further checks don't succeed) pushing my commits to remote repository. I'd like to check which version of git is running on GitHub servers. Is there any git command to perform such task? Thank you. ...
I'd like to push and pull all the branches by default, including the newly created ones. Is there a setting that I can define for it? Otherwise, when I add a new branch, locally and I want to pull it from the server, what is the simplest way to do it? I created a new branch with the same name and tried to pull but it doesn't work. Ask...
I'm forced to use SourceSafe at my job. There is no way this is going to change. I would like to use another source control for my own need in parallel. I want to be able to keep an history of my modifications, branch easily and merge. I can install any application that doesn't requires admin rights. I cannot install Python or anything t...
Hi. Starting to think about a tool/app to use for a project that will have multiple devs, with testers/reviewers/etc.. I'm going to need the app to provide the ability to ccheck in/out the docs/code, as well as keep track of everything on a quarterly basis. (IE, the code/docs will change on a periodic basis). At a granular level, each f...
We have a repository with the following structure: repos trunk module1 module2 ... tags branches We usually release individual modules to the customer and sometimes the whole application. Now we are going to deliver module1 and I'm trying to decide between these two options: a) tag module1 (i.e. copy trunk/module1...
I have experienced strange functionality of subversion. We are using latest 1.6 Svn server visual svn and tortoise svn 1.6.6 We have defined property svn:needs-lock to a file, then if you copy over file from different location it shows local change if you try to commit SVN it allows you to Commit even if you didn't obtain the LOCK. Th...
Until recently we have been using SVN for all projects of our web studio, and there is a very convenient feature present in several clients like Subversive and TortoiseSVN that can extract all files that have been changed in a certain revision. Is there a way to do it in Mercurial? I don't care if it's done via a GUI or a command line, ...
I have the following folder structure for my project src/ test_unit/ package1/ test_unit/ package2/ test_unit output/ In my devel branch all folders should be version controlled, but the master/stable branch should ignore and not merge test_unit/ and output/ folder. How can I achieve this? With .gitignore it won'...
I downloaded some source files on a Mac that were previously part of some working copy on the authors computer, I need to use these files in another repository but the SVN client "Versions" for Mac is picking up on the data from this old repository. I can't find the ".SVN" folder anywhere... any idea on how to "cleanse" these files so I ...
Using subversion v1.6.6 and TortoiseSVN v1.6.6.. After having created a branch and meticuously adding detailed comments whenever doing a commit on the branch, I can't seem to find those comments after I have merged the branch back onto the trunk. Note : We're employing a feature branching strategy where all development is done in new b...
I have a problem that I describe poorly in another question. I'm posting this to make it more clear what I want to do, and what problem I'm encountering. There is a highly-voted answer, but it doesn't actually address my problem (short story: I'm not trying to add a symlinked directory to my version-controlled project). If you already k...
Possible Duplicates: Any svn:hook script that enforce commit with comments? Creating a Required Comment Hook for Tortoise SVN I often see a slew of commits, but no notes referencing the tickets... And so I end up going back and reviewing the diff manually. Not necessarily bad, but it would be nice to have notes. Any ideas? ...
For example, say I moved a file from /project/file.cs to /project/subdir/file.cs. It would be nice if nautilus automatically converted this to bzr mv /project/file.cs /project/subdir/file.cs. Is it possible to set this up? It would also be nice if I was warned when doing a plain old mv on version controlled files, but I suppose that's a...
Bazaar has a Launchpad pseudo-protocol (lp:) that able the user to operate in remote branchs without write full Launchpad location, I'm searching a way to create my own pseudo-protocols in a way like this (similar to GIT): bzr remote my sftp://[email protected]/home/myuser/myrepo/ bzr push my:mybranch bzr push my:otherbranch bzr push ...
I've been using SVN for some time now, and am pretty happy with how it works (but I can't say I'm an expert, and I haven't really done much with branches and merging). However an opportunity has arisen to put in some new practises on a new team and so I thought I'd take a look at DVCSs to see if it's worth making the jump. The company I...
I wish to include the dll output by a project built from an external SVN repository within my own project. What is the best approach to achieve this aim. As the external project svn:ignores the bin\release folder I don't think I can use an svn:external. Building the latest version and copying across the dlls seems prone to error. In t...