Suppose I have 5 local commits. I want to push only 2 of them to a centralized repo (using an SVN-style workflow). How do I do this? This did not work: git checkout HEAD~3 #set head to three commits ago git push #attempt push from that head That ends up pushing all 5 local commits. I suppose I could do git reset to actually undo...
I've just inherited a project which was maintained using Git. At one point, the code was deployed onto 3 separate systems and each system maintained their own decentralised Git respository. Each of the 3 systems extended the original base system in 3 different directions. None of the 3 systems have been synchronised against each other. ...
Hi Sorry for the long winded title, but the requirement/problem is rather specific. With reference to the following sample (but very simplified) structure (in psuedo SQL), I hope to explain it a bit better. TABLE StructureName { Id GUID PK, Name varchar(50) NOT NULL } TABLE Structure { Id GUID PK, ParentId GUID (FK to Structu...
I have a Java project which will include a number of large SQL statements for querying the database. My question is: where should I store them? I'm fairly sure I want each statement its own text file managed by source code control. As Java doesn't support multi-line strings I can't easily put the SQL in my .java files and I don't thi...
I've found some similar questions (here, here, and here) asking about storing documents into version control. I have a more specific requirement and general question. The specific requirement is that I want to use Git. The more general question is, how should documents (for design, test, general practices, tips, etc, of a project) be sto...
Just wondering if its possible to exclude large files or certian file types from an SVN update? I ask because I am doing a checkout from home, but we have got several large .flv files in trunk which I do not need at this time and I would like to save the bandwidth. I am using Tortoise SVN. Any ideas? ...
Does anyone know a way to export the VBA code from a number of Excel documents, so that the code can be added into a subversion repository? Without having to manually open each document and export the code. ...
I've read many answers to similar questions, but still didn't get to the answer that I was looking for. We've got a group of about 12 devs and business analysts working on one app. It's an enormous application, I'd guess about 1000+ pages in a mix of ASP and ASP.NET. What I'm wondering is how the pros manage versioning of a large app...
I am setting up a new TFS 2008 Server that we are going to migrate to (from VSS) and I am trying to layout the source control repository. Having read the question How do you organize your version control repository? I am trying to organise my folders in a similar way. I want to create a top level folder called 3rd Party Tools or simila...
Microsoft Visual Studio uses XML to save its .vcproj project files. So diffing XML project files should be easily. Unfortunately, if you change any of the project file's properties, Visual Studio insists on randomly shuffling the XML nodes of the project file! This makes textual diffing and merging of project file changes basically impo...
SVN made branching much easier by making branches really cheap, but merges remain a real problem in SVN - one that Git supposedly solves. Does Git achieve this, and how? (disclaimer: All I know about Git is based on the Linus lecture - total git noob here) ...
I'm using Eclipse with Subversive SVN Team Provider 0.7.0.v20080425 as well as the latest update of Subversion installed on OSX 10.5.6. My problem is that whenever I add a project folder to Eclipse enabling the Team integration it disables the SVN functionality from within the terminal throwing me the following error message : svn: ...
Is it possible to have multiple repositories for the same project? I am currently using SVN with TortoiseSVN with the repositories on an external hard disk at my home, and well as regards a backup-wise solution, this isn't ideal. So what I have in my mind is making an account with unfuddle and having a second (my home one being the fir...
This is not strictly a technical question, however I feel this will be useful for many technical people as well. I'm looking for a version management / backup solution which need not be only for source code. This could be for non-text files e.g. images. The requirement is this - Every time I save the file from within the application,...
Hi, I have to produce a versioning system to store multiple versions of my articles in a database to allow the user to roll-back if required. My first thoughts are when the user wants to edit an article really I get the sql to no longer update but you insert their information back into the database. Currently the problem is i have an a...
By default, Visual Studio 2008 puts the Unicode byte-order mark in front of any file you save. You can override this on a per-file basis by going to File > Advanced Save Options and picking a different encoding. How do I tell VS to use a default encoding for all files in a particular project or solution? This is drastically screwing up ...
I have a git repository with (at present) three branches: head is the stable version (not to be confused with git HEAD) experimental is experimental code; it's supposed to compile norman is my sandbox; code in it might be broken The "master" git repo is on a file server that is backed up. But I have replicas on a local disk, on a m...
I've heard that Git has lots of advantages over subversion/CVS, especially speed so why do projects like FreeBSD continue to use CVS for the ports system? Wouldn't the distributed version control make it easier for new ports to be created and updated too? Also mercurial should be another good option and the same gos for all package manag...
Now SVN most popular. What about future? Now I am ready to migrate all my sources to ANY source control I am thinking about Mercurial. Is it good choose? Any suggestions are welcome ...