version-control

Subversion: Is there anything faster than "svnsync"?

So I have my subversion repository stored on some cloud (for example code.google.com) but due to various reasons I need to make my code non-public. I decided I needed to download the entire repository and migrate to my own svn server. So I went about using: svnsync init DEST SRC svnsync sync DEST And it took about 0.5 seconds for ea...

Subversion: Migrating from cloud SVN repo to local SVN repo... lost history?

I created my own SVN repo locally. Then used: svnsync init DEST SRC svnsync sync DEST svnsync checkout DEST The checkout worked successfully and I got all the files from the original SVN repo and that is definitely a good thing! But when I did: svn log All I get is the message: svn: Item is not readable Does the file not have a...

TFS: cannot setup up new build

I have a problem that is described here: http://stackoverflow.com/questions/2146198/tfs-cannot-set-up-new-build I use Visual Studio 2008. Unfortunately, the solution provided there, didn't help. I tried to remove and add again my TFS server - no help. Also, it's not a problem with security policies or lack of proper right, because I can ...

Git-p4 issues when trying to submit back to perforce

So I'm having issues getting this to work properly. I chug along doing a few things in my git repo, commit, git-p4 rebase and git-p4 submit. The problem pops up on the submit, with the following errors: common/data/testsheet2.xls has type 100755, expected 100644 I get this all over with several different files. Perforce is set to have al...

Is there a fast way to lock my SVN repository's trunk?

There are moments when I need to be sure that no one is committing to either a specific branch or to my trunk. Release builds and reintegration merges are an example. SVN "locking" all the files is not realistic (very long since project is huge). I also don't believe that locking prevents someone from committing new files. What would...

Commit only property changes on root of repo, not files

I have an SVN repository with uncommitted changes to files. There is also a change in the svn:externals property on the root folder. How do I commit the property changes, WITHOUT committing the changes to the files themselves? ...

revision control for server side cgi programming

Hi all, A friend of mine and I are developing a web server for system administration in perl, similar to webmin. We have a setup a linux box with the current version of the server working, along with other open source web products like webmail, calendar, inventory management system and more. Currently, the code is not under revision c...

Source Control - XCode - Visual Studio 2005/2008 / 2010

My apologies if this has been asked before, I wasnt quite sure if this question should be asked on a programming forum, as it more relates to programming environment than a particular technology, so please accept my (double) appologies if I am posting this in the wrong place, my logic in this case was if it effects the code I write, then...

how to merge changes with Bazaar explorer

So, I'm just getting started with Bazaar. I am using Bazaar explorer for Windows as the GUI. I can see how to send my changes via email, but I don't know what to do with the change file once I have it. Where do I put the change file, how do I merge the changes into the Trunk? If I select merge, and then the folder containing the chang...

What are the merits of using the various VCS (Version Control Systems) that exist to track Drupal projects?

I'm trying to find the best version control strategy for my workflow with Drupal. I have multiple sites per install and I'm pretty sure I'll have a separate repository for each website. As far as I know, the VCSs worth considering are: SVN Bazaar (bzr) Git Mercurial (hg) I know how these compare to each other in general, but want to ...

TFS: comparing changesets

In TFS we can find "compare" a file between 2 changesets. Is it possible to compare 2 changesets. Say take changeset "r" as reference and compare it with changeset "s" and find the files/folders which were added/removed/delted/edited ? ...

Is there an intelligent 3rd merge tool that understands VB.NET

I am having problems with our merge tool as sometimes it fails to match the unchanged blocks in the two branches correctly. When this occurs the merge tool becomes useless, and the merge has to be done by hand. Therefore I am looking for a tool that: Understand what VB.NET function/method definitions looks like and gives them a h...

Is there a 3 way merger tool that “understands” common refactoring?

When a simple refactoring like “rename field” has been done on one branch it can be very hard to merge the changes into the other branches. (Extract method is much harder as the merge tools don’t seem to match the unchanged blocks well) Now in my dreams, I am thinking of a tool that can record (or work out) what well defined refactorin...

Merge an SVN subfolder and a git project changes

There is an internal SVN repository on which many changes have been made. This contains not only the project of interest, but also many other folders. There is an external git repository, on which many changes have now been applied. What is the best way to merge these 2 sets of changes. I was thinking, take the diff of the git HEAD an...

Is there a source code control system that understands/records c#/vb.net factorings and how to merge them?

MolhadoRef is a refactoring-aware SCM tool that is capable of capturing and versioning of the semantics of Java program entities and refactoring operations that were performed on those entities. Does anyone know of such a system in the .NET universe? (Why is it that .NET always seems to be way behind java with the type of ...

How To Automatically Script SQL Server: 'Generate Scripts' for SQL Database

I want to run scheduled nightly exports of my database code into my SVN source. It's easy to schedule automated check-in's into svn from a folder, but scheduling the export from SQL in SQL Management Studio is Right click target database, choose Tasks > Generate Scripts. Follow the wizard and presto you've got scripts in a folder....

Learning version control with git first or via SVN?

Currently a group I am a part of uses SVN. We are looking at moving to git. I have used git personally (and am actually using git-svn to bridge back to the main SVN repository), so I am convinced of its benefits. One concern is that git is more complex than SVN. We have some brand new folk who will need to learn version control from th...

Does converting a source module from Unicode to ASCII or vice-versa seriously mess up the diffs?

In a test suite, I had tests that deal with unicode scattered about in various modules. I have now consolidated them into a single test class. The .cs source modules that no longer have any unicode in them, remain unicode-encoded, and as a result are 2x their required size. I'd like to convert them back to ASCII, to save the space, an...

Where do custom build tools go, in your source tree?

On every project I've worked on, I have one or more tactical build tools. They do verification or checksumming or some specific build-time task. Often these tools are project-specific and written in the project's implementation language. Q1. Do you have such tools? Is this a project-smell that I have these tools? Q2. Where does t...

How to start a major iPhone app update in Xcode

I have an app in the iPhone app store and have released several minor updates to it. I want to begin work on some major feature additions and reorganization, but don't want to lose the source code of my most recent version in case everything goes horribly wrong. Should I start a new Xcode project from scratch and copy my existing source...