I have my projects in 2 repositories. One under SVN and one under Git. Whenever I change something in SVN I want to do the same thing to the Git repository. Say I make a change to SVN repository, producing revision 125. How would I apply these same changes to my Git repository (assuming my Git repository is up to date with revision 124)...
Currently trying to build a script utilizing cmdlets from the MS released "Team Foundation Server Power Tools" package. I'm attempting to flow command logic from the success or failure of the "Update-TfsWorkspace" cmdlet however I can't seem get a return code out of the call nor can I capture the output using Out-String. I'm using Powe...
Is there any way to have something like svn externals for files stored in source control (Subversion preferably but I'd be interested if it's possible or easier for other SCM systems). Here's what I mean. Say I've got a whole bunch of SQL scripts and these have to be merged into one big script for packaging each release. It would be goo...
I am about to start a project (.NET) and need to decide between TFS and SVN. I am more used to SVN(with tortoise client), CVS and VSS. Does TFS have all features available in SVN Have any of you switched from SVN to TFS and found it worthwhile? Also it looks like we may need Visual Studio if we need to work with TFS. [Edit] Money is n...
I have a huge MS Access document with built-in VBA codebase. Is it possible to track the file (as I am developing it) with a (mercurial) version control system? Can I extract code and track that? Or is it just the-binary-file-path? Thanks. ...
I'm looking for a good VCS (Version Control System, eg. CVS) that runs on Windows or IIS5 (I have a webserver and see no reason to install Apache). Preferrably something with a Visual Studio integrated client, and preferrably free. Does such a beast exist or will I have to buy sourcesafe? ...
This is something I've come across twice in the past month and I'm not even certain how to phrase this as a Google query. I'm actually using SVN for all of this, but it seems like this should be a general versioning problem. We have two projects and one of them is dependent on some of the other's code. Due to API issues, it is not pra...
The company where I work has been trialling scrum on a project and is now looking to roll scum out to three or four different project teams. We are envisaging that these teams will work in separate feature branches (we are using SVN). We are not sure if the different teams’ sprints should end simultaneously or if we should stagger the ...
My team member made a reference to a DLL on his local drive (e.g., C:\mystuff\thirdparty.dll) and checked in the project with the reference. I refreshed my local copy of the project and now I have a broken reference: <The system cannot find the reference specified>. I have the thirdparty.dll on my local machine, but it is not in the sa...
I have a file, its contents are identical. It is passed into gzip and only the compressed form is stored. I'd like to be able to generate the zip again, and only update my copy should they differ. As it stands diffing tools (diff, xdelta, subversion) see the files as having changed. Premise, I'm storing a mysqldump of an important data...
I'm working with a 3rd party API that is distributed as source code. This is great because I can fix things on my own, but I also receive lots of updates from the 3rd party. I have my own svn repository for my code base that includes my version of the API. I get the official API updates by checking out a version from the 3rd party's svn...
Is it a best practice to have my local source tree mirror the server source tree? It seems to me that it should, however my department at work does not do it that way and I find it very confusing. If not, what are scenarios where it makes sense to deviate from the server source tree? EDIT: To clarify what I mean - say the source directo...
I have been using Git for some time now to manage my own personal projects. I didn't really think about how I used it. I usually commit all the changes whenever there is a milestone not really thinking. But after reading a blog post that mentions how you should right your commit messages, I realized that I don't really know how to prope...
Hello - I don't know much about source control beyond what I have used at work [Perforce]. I'm looking for a product with the following.. Free Centralized (server running on the LAN) Good integration with Microsoft Visual Studio (built-in / free plugin?) Good integration with Apple Xcode (built-in / free plugin?) Are there many that ...
I have SQL Server databases and do changes in them. Some database tables have records that are starting records required my app to run. I would like to do version control over database and these records (rows). Is it possible to do this and bundle it to SVN version control I have for my source code or are there other solutions to this? I...
i'm trying to merge a branch in Visual SourceSafe 6. Here you see the bug in the 'main line' code base: A hotfix branch was created, and the file was fixed: Now it's time to merge the hotfix back into the main line development. i select the file i want to merge, and hit the SourceSafe -> Merge Branches... menu option: With the ...
We are upgrading our source control (most likely to Vault) at work and are moving to the branch methodology, and are having some problems with working out the folder structure to use. We intend to use the Trunk as the development line, and a branch will be a release and bug fixes to that release. We have come up with two folder structu...
I once ran across a commercial tool for Windows that allowed you to "stash" code changes outside of source control but now I can't remember the name of it. It would copy the current version of a document to a backup location and undo your checkout in source control. You could then reintroduce your backed up changes later. I believe it wo...
Using the linux command line and subversion, is it possible to take a directory and add version control to it? Basically, I want to import the directory into a newly created repo, but also have the directory be a working copy without having to check it out. ...
We're having a spirited discussion about this at my workplace. We're talking about user uploaded images for a bunch of products, not images needed to display the basic site. I say "no way" but I'm curious what others think. Update: Just to clarify. These are customer supplied images for products that they are entering/modifying. ...