version-control

Renaming directories in TortoiseSVN - conflicted state

I always have problems renaming a directory in TortoiseSVN. It seems to be taking the correct steps, marking the original directory and directory files for deletion and adding a new directory with the new name. I try to commit and get conflicted state and wound up checking out my whole project again. Is this a known bug? My workaroun...

XCode SCM - not all files are being tracked. Use Versions?

Hello, I am new to subversion. I've tried Versions application, and very soon got disappointed - it doesn't copy .xcodeproj file properly(project doesn't launch and says that some file is missing) and is really bothering when I want to modify my project/remove some files. And I couldn't find any decent guide on it. So I am trying out ...

Using Subversion in Xcode

It seems that all of the initial Google results for "using subversion with xcode" are actually just tutorials for installing and configuring svn and Xcode, as opposed to actually using the two (i.e. interacting with svn via Xcode's GUI). Is anyone aware of a good guide that teaches the tricks and pitfalls of working with svn via Xcode's...

How to explain source control and best practices to non-technical managers?

My manager recently asked, "Is there a standard procedure or process that is typically used by businesses to ensure the file integrity of files -- maintaining their separateness from those that are involved in work-in-progress projects -- yet permitting all necessary users to gain access to the most up-to-date and accurate files?" Of co...

How to create a new source code branch using TFS API?

Hi I am trying to create a new branch using the API, and have used both PendBranch() and CreateBranch(). The problem with CreateBranch() is it commits immediately and I want to be able to add comments as the branch is checked in. So, I what I did is shown below. Basically I get all the information like server item and local item to be ...

Effective workflow to allow designers access to portion of SVN repository

We have a team of developers and a team of designers. Let me be very clear. The developers are NOT artists and the designers are NOT all that code-savvy. The developers work on a web application in an SVN repository locally on their machine. We have Windows 2003 workstations which allow each developer to host each website in IIS for ...

How to delete file in RCS?

Does RCS have something like svn/p4 delete where it keeps the file history but marks it as deleted? Or do I just remove the file and the matching v file in the RCS directory? What's the recommended way of removing and/or moving files with RCS? ...

Storing third-party framework/middleware into source control that needs to alter your compiler/IDE

I know there are posts that ask how one stores third-party libraries into source control (such as this and this). While those are great answers, I still can't find the answer to this: How do you store third-party middleware/frameworks binaries that need to alter your compiler / IDE for the library to work properly? Note: for my needs, I...

Using Subversion, how can you tell if all the files in a particular hard-drive folder have been checked-in and comitted to the repsitory?

With Source Safe, after I add files to Source Control, they are set read-only locally. So then if I go to Explorer, and check the contents, I can quickly see which files didn't get into source control, because they are still read-write. With SVN, the software doesn't mark the local files as read-only after check-in, which is fine, but ...

TFS - files ending up in wrong folder

Hi, I'm investigating this for someone else but I hope this explanation is correct: We have a lot of files and a lot of folders in TFS source control, but two of them are these (made up names): $/Root/Shared/... $/Root/Solutions/... 5 files from the folder $/Root/Shared/Client/Main are now checked in, and when looking at the changese...

help understanding what's possible with source control integration into issue tracking software

This is related to (but not identical to) "How important is version control integration with your bug tracking software?" I am currently using JIRA as issue/task tracking software with a small team, for potential evaluation for broader use in our company. Because we use SurroundSCM, and JIRA does not support either SurroundSCM or the ge...

what in general does the SCC API do?

I can't seem to find general documentation on the Microsoft SCC API. I don't want to wade through detailed documentation on the specific interfaces/methods/etc, I just would like to know what in general it allows and what concepts it uses. (edit: without having to download the whole SDK or applying for a license requiring an NDA.) edit:...

Source control strategy for specific folders within CMS-generated site

I have an ASP.NET website where most of the pages are generated and published via a CMS system. This includes static HTML, CSS, ASPX, ASP, images, etc. However, we have some user controls and pages that are managed by a separate dev team. These files live under the same web root but are not managed in the CMS. These files are limited to...

Easy way to create perforce changelist with multiple filespecs

I wish to submit a changelist with multiple filespecs, e.g. ...this... ...file.h ...theother.... Perforce won't let me. I could create a changelist from a file but I do want a chance to review the files and enter the comment. This is for a command-line solution. ...

Need to restore a deleted branch subversion

Crap. I have two working copies of a subversion repository, one of the trunk, and one of a branch I created. Then, I accidentally the deleted the branch in a repository browser. How do I restore the branch? Is there a way to undo the most recent commit for the whole repository? Any help is much appreciated. :-\ ...

Merging software for xaml

For you wpf silverlight people who are working with source control that allows merging. What is the best software to use for merging? I am more worried about the xaml then I am the code because this has the potential to change the most during a merge. ie beyond compare, kdiff etc... ...

Push DVCS repository to master without needing codebase

To work on a client's staging environment I have to connect through a VPN which locks all normal network traffic and prevents any connection to the Internet. This would immediately prevent any of the "normal" VCS solutions from being used as it's not possible to gain access to the server. A solution to this would be to create a DVCS rep...

Using version control (SVN, CVS, etc) keywords for program logic

On a couple of projects now, I've used the SVN keywords to retrieve some information about the version of some core files. Something like this (PHP): $revision = '$Revision: 1254 $'; // automatically updated each commit $revision = preg_replace("/[^0-9]/", ""); echo "This file is at revision #" . $revision; It occurred to me however,...

How to configure Telelogic Synergy so that the default type for "unknown" file is binary rather than ascii ?

Hi, if I am not wrong, Telelogic Synergy mapped new files to a type depending of their extensions. If the extension is unknown, the file is by default declare as a base type ascii. Is it possible to make sure that "unknown" file type end up as binary rather than ascii ? Thanks, Thomas ...

Is there a Source Control out there for .Net and iPhone development?

I mainly do .Net development but have just bought an Apple Mac Book Pro and am wanting to do some iPhone Development as well. Is there a particular Source Control Software out there which will handle integration with both Visual Studio and iPhone develeopment (Titanium/XCode) ? Thanks ...