Hi, After looking at other questions related to sharing solutions between VS 2005 and VS 2008 it seems that the way to go is to have two solution files (one for VS 2005 and one for VS 2008). However, if the solution is under source control (VisualSVN in our case), how would we maintain two solution files and not keep overwriting one ...
Are there any good issue tracking systems that can track issues on git commits/branches? ...
All, I currently have two projects that are under SourceSafe that I am unable to migrate to our SVN server for a number of reasons. However I am currently in the process of trying to merge fixes from one project into the other. I know Sourcesafe isn't the best at this but the process I am going through just now is particularly tedi...
Why do you (and/or your company) use Visual Source Safe instead of the "other" version control systems? ...
I plan to have 2 projects. 1. mbtech.crm.mvc 2. mbtech.crm.tests I will have a solution named mbtech.crm What is the best way to set these up so that I can track them in Subversion? Option 1 (then where does my solution file go)? - mbtech.crm.mvc - tags - trunk - branches - mbtech.crm.tests - tags - trunk - bra...
My understanding of a baseless merge in TFS was that it was a one-time deal, and merges afterwards could be made without having to be baseless: from http://msdn.microsoft.com/en-us/library/bd6dxhfy(VS.80).aspx /baseless - Performs a merge without a basis version. That is, allows the user to merge files and folders that do not have a...
Let's say branch B is a topic branch off of branch A, and you want those changes in branch C. What does it mean when you cherry-pick the merge commit of branch A and branch B to branch C? For example, if you use the -m flag to specify the old HEAD of branch A to cherry-pick the merge to branch C, does that simply mean "Take the diff be...
I've been working on an Eclipse plug-in project for a while now, and I've run into a situation where I need to split the project up to seperate the test cases from the plug-in package. I'm using git as version control. To describe this simply, I'm versioning the old project like this: workspace/ | +-- myplugin/ | ...
http://blog.assembla.com/assemblablog/tabid/12618/bid/6986/Release-2-0-restricting-free-plans-giving-back-with-features-and-pric I'm very disappointed about this... I use Assembla for my personal projects(commercial) and now I have to move everything to another place! There are some questions about different free hosting... I extracte...
Do you have a good ignore pattern for svn, git, etc. that handles an eclipse workspace? I want to version handle all projects in the workspace. It has to ignore all the eclipse configuration, compiled files, and output folders. ...
I've personally always used some type of external application for my SCM work; these days, that means tortoiseSVN on windows and versions.app on the mac. However, I keep running up against developers (namely eclipse users) who argue that SCM is better done within the IDE itself. I've yet to hear any really compelling arguments in favor...
Hi, I recently started using Git as my version control system for some Cocoa projects I'm working on and wondered if there are best practices for working with version control systems on Cocoa projects. There is the obvious "build" directory which I exclude from versioning as it's not important and can change quite a bit when debugging ...
I have a local Git repository I've been developing under for a few days: it has eighteen commits so far. Tonight, I created a private Github repository I was hoping to push it to; however, when I did so, it only ended up pushing eight of the eighteen commits to Github. I deleted the Github repo and retried, with the same result. Any tho...
I currently have a couple of SVN repositories hosted at Unfuddle and I'd like to have a local copy of the repositories as a backup. Ideally, it would be a "live" backup so my local repository would "ping" the remote repository, and if any changes were detected, the changes would be applied to my local repository. Has anyone tried this b...
We're a distributed team of 5 developers working on rather large integrations project. We currently use SourceSafe (yes I know it sucks but it has just worked until recently and we've used it forever). Our biggest problem has recently become performance. Checking in and out project just takes forever and we're finding ourselves spending ...
I have a project that I am building with Netbeans 6.1 and I am using SVN. I deleted some files on the local machine then attempted to commit my changes to th SVN repository. The commit fails with the error message Entry for 'C:\path\to\project\myfile' has no URL Where myfile is the deleted file. Is there some way to tell SVN that ...
I have a somewhat complicated branching structure at work (at least for me). It is something like this: Main | 1 | 2 | \ 3 \ Ver2 | 1 | \ 2 \ | ProjectA 3 | 1 There are 2 branches off of main. "Ver2" which has everyone's changes for the next version, and "Proje...
You have several maintenance branches for existing releases of your software. Some developers are making direct changes in the maintenance branches, and merging periodically into the trunk. Now comes an extensive refactoring in the trunk codeline, scheduled for an upcoming major release. But this makes the maintenance branches fundamenta...
Hi All, I've used both SVN and CVS a little bit, but will need to choose one for a new project I will be starting. Can anyone who has used both extensively please offer some pros and cons and which they think is better? Best learning resources would be appreciated too. This will be for a small project, just one or two developers to s...
This one has me scratching my head. I'm running Subversion 1.3.1 (r19032) on Ubuntu. All was well until recently when I tried to run svnadmin verify prior to a dump. This is the error message: svnadmin: Invalid diff stream: insn 0 cannot be decoded I have looked around for an explanation and fix but can't seem to find one. Subve...