When we put Core Data model files under version control with git, we always have a horrible time merging changes - the only sure fire way we've found to avoid having to merge in changes by hand is to communicate among the team to block off access to the model while one person makes their necessary changes and pushes, then the next person...
I need to have several changesets rolled-up into a single list of changed files, so that I can code-review the collective differences (from an initial changeset, up through an arbitrary ending changeset), rather than reviewing all changes through the individual intervening changesets. I'm using VS 2k8. What is the easiest way to accomp...
I created a label using the new label context menu: I defined the parameters as follows: (unlocked) Label: ms_test Description: Created by ms view: //depot/Projects/Shared/... //depot/Projects/AddIn/... The label is created and shown in the label pane but when I select the label and click on the "List files at ms_test" menu it...
Hello all I am having a problem with version control in subversion. I checked out a working copy from respository and got locks on all of its files. Then, without releasing the locks I have deleted the folder from disk. I can't delete the folder from repository, since its got a lock If the I and try to release the locks recursively, i...
I am curious if there are any solutions out there, preferably free, that can have a central database to publish data to in a versioned manner. For example, Client 1 decides to edit a persons profile so it gets a local copy on its machine to make changes to. When they are happy with there edit they publish the results to the central dat...
Sometimes XML files needs to be stored in some VCS. Such files are often edited using GUI tools which can reorder the elements each times as they want. Also VCS merging is usually line-oriented, and often XML files either looks likes one long line or fully indented like <foo> <bar> <name> n3 </name> ...
Is there a decent Subversion client available for XCode? I am so tempted to write my own as of this morning after having a conflict on an update. I've done merges manually editing the ">>> mine" and "<<< theirs" markers but there has GOT to be a better way in this day and age. Does anyone know of an easy way to resolve conflicts graphica...
I have a project which was branched, and a bunch of files (F1) were moved into a different directory and changed (F2). Now, I want to merge the branch back to Trunk and keep revision history, but I want to keep both F1 and F2. Is there a way to do this in subversion? ...
I want something in git that is similar to Mercurial's Bigfiles Extension (note: I know of git-bigfiles, but that is unrelated). Basically I want to store large binaries in my git repository, but I don't want to get every version ever of the large binary when I do a clone. I only want to download the large binaries when I checkout a spe...
A developer in my team has been using a branch bound to the server (IE, only using checkout, update, and commit), but also often uses the --local flag on commit and then commits to the server in a batch. She recently experienced a situation where she is missing some local commits, and can't find them in the repo OR her local code. She su...
Supposing I have following scenario: I cloned some open-source project, say from URL X. Now I have local clone of it. I made some changes to local clone to try things out and commited them locally. Now what I want is following: I want to get update from the open-source project X. Just get all its latest code, without my changes at all...
A junior programmer in our office has an unfortunate (but understandable) habit of using Eclipse's "Correct all the indentation in this file" feature. As a result, his checked out copy includes thousands of lines that register as changes, simply because the whitespace is different. Accepting all these changes - while other people are als...
I have a situation where I have created a new team project and imported source code (with history) into TFS from VSS. The problem is that the team project name is wrong. I am planning on creating the new (correct) team project and moving source code from $WrongTeamProjectName to $CorrectTeamProjectName. Will it be safe for me to delete...
Hi, All, I have a bad fortune of using ClearCase with UCM at work. We try to find a way to get user experience smoother while using it. One of the main problems is that all files are read-only until checked out. This interferes with using IDEs and their refactoring capabilities. Unreserved checkout changes little as it still requires pe...
I have several projects that build reusable libraries. All these projects are under source control. When I use these libraries in a project I simply link to the same ONE version on my local drive. However as you can imagine, this can cause problems when I commit back, and a different developer tries to clone the repository. What is the...
Is there any version control system available with an MVFS-like virtual file system in addition to the ClearCase? I can't find any. Thanks, Mart ...
Hi. I am working on a legacy application for a client, that uses Reporting Services. I have imported the project SVN repository, which includes a Reporting project and folder, setup in a Visual Studio Reporting solution/project. Included in this SVN folder (but not the VS solution/project) are .rdl*files (the actual report definitions)...
I'm working on a small side-project and I'm using connection strings and also api keys and values that should not be seen or used by other people. I use a public GitHub account for source control. What is the usual method for using source control when these values are in plain text in web.config? Do I need to remove the values manually ...
How can I use Resharper without adding the Resharper generated files to the TFS server. Is there some sort of .ignore file/setting I can let the TFS maintainer modify. Or is it done client-side? We're using TFS 2008, but will be upgrading to TFS 2010 in the near future. ...
I'm using T4 templating to generate some .config files in a project I'm working on. I've set up a pre-build task to look for all .tt files in the solution directory, and then execute the TextTransform command-line tool, so that the code is freshly generated on each build. However, I'm now having "Access Denied" errors because (for exam...