    tf diff /shelveset:shelveset /format:unified

**Edit:** This writes to standard output.  You can pipe the output to a file.

For more options, see [Difference Command][1].

  [1]: http://msdn.microsoft.com/en-us/library/6fd7dc73%28v=vs.100%29.aspx

Because TFS doesn&#39;t natively support patch files, the most common thing I see people do on CodePlex is simply zip the modified files and upload the zip.  The project coordinator then does a diff against their own checkout.

However since CodePlex also supports TortoiseSVN, more and more people are using that to create their patch files.

I wrote a blog post about a similar issue where I used the TF.exe command and 7Zip to [create a TFS patch file][1] that could then be applied on another TFS server or workspace. I posted the the Powershell scripts at [Github][2], which can be used to Zip up any pending changes on one workspace and then apply them to a different server. It would have to be modified to use a changeset instead of pending changes, but that shouldn&#39;t be too difficult to accomplish.


  [1]: http://codeblog.theg2.net/2014/09/create-tfs-patch-file-with-pending.html
  [2]: https://github.com/gbrayut/CodeBlog/tree/master/20140914_TFS

So basically I am looking for good templates for writing both technical and functional specs on a project or work request.

What do you use? How deep do you get while writing the specs? Any additional general tips you could provide would be appreciated.

My company needs these badly. I work for a contractor and right now we do not use these documents at all. 

**EDIT:** I have read Joel&#39;s take about [Painless Specification][1], I really liked it, but are there any other opinions :) 


  [1]: http://www.joelonsoftware.com/articles/fog0000000036.html

Templates of Technical and Functional Specs

Since Graduating from a very small school in 2006 with a badly shaped &amp; outdated program (I&#39;m a foreigner &amp; didn&#39;t know any better school at the time) I&#39;ve come to realize that I missed a lot of basic concepts from a mathematical &amp; software perspective that are mostly the foundations of other higher concepts.

I.e. I tried to listen/watch the open courseware from MIT on [Introduction to Algorithms][1] but quickly realized I was missing several mathematical concepts to better understand the course.

So what are the core mathematical concepts a good software engineer should know? And what are the possible books/sites you will recommend me?

  [1]: http://ocw.mit.edu/OcwWeb/Electrical-Engineering-and-Computer-Science/6-046JFall-2005/CourseHome/


What are the core mathematical concepts a good developer should know?

Creating a patch is very easy in SubVersion, With Tortoise, you right-click and select Create Patch. But for the life of me, I can&#39;t find this functionality in TFS. Is this possible?

If not, what&#39;s the standard way to submit patches in open source TFS hosted projects (a la CodePlex)?

Creating a Patch with TFS

<p>Creating a patch is very easy in SubVersion, With Tortoise, you right-click and select Create Patch. But for the life of me, I can't find this functionality in TFS. Is this possible?</p>
<p>If not, what's the standard way to submit patches in open source TFS hosted projects (a la CodePlex)?</p>


How do I discard changes in my working copy that are not in the index?


How do I discard unstaged changes in Git?

I sometimes use the feature &#39;Reconcile Offline Work...&#39; found in Perforce&#39;s P4V IDE to sync up any files that I have been working on while disconnected from the P4 depot. It launches another window that performs a &#39;Folder Diff&#39;.

I have files I never want to check in to source control (like ones found in bin folder such as DLLs, code generated output, etc.) Is there a way to filter those files/folders out from appearing as &quot;new&quot; that might be added. They tend to clutter up the list of files that I am actually interested in.  Does P4 have the equivalent of Subversion&#39;s &#39;ignore file&#39; feature? 

Can you &quot;ignore&quot; a file in Perforce?

Is there an equivalent of svn&#39;s blame for Perforce on the command line? `p4 annotate` doesn&#39;t display usernames -- only changeset numbers (without ancestor history!).

I currently have to track code back through ancestors and compare against the filelog, and there just has to be an easier way -- maybe a F/OSS utility?

Perforce blame

Visual Studio solutions contain two types of hidden user files. One is the solution `.suo` file which is a binary file. The other is the project `.user` file which is a text file. Exactly what data do these files contain?

I&#39;ve also been wondering whether I should add these files to source control (Subversion in my case). If I don&#39;t add these files and another developer checks out the solution, will Visual Studio automatically create new user files?


Should I add the Visual Studio .suo and .user files to source control?

Do you guys keep track of stored procedures and database schema in your source control system of choice?

When you make a change (add a table, update an stored proc, how do you get the changes into source control?  

We use SQL Server at work, and I&#39;ve begun using darcs for versioning, but I&#39;d be curious about general strategies as well as any handy tools.

*Edit:* Wow, thanks for all the great suggestions, guys!  I wish I could select more than one &quot;Accepted Answer&quot;!

Stored procedures/DB schema in source control

Let&#39;s assume that some developer in my team shelved his changes that he did in branch A. And I am working on branch B. Can I unshelve his changes into branch B? (By GUI or command prompt) 

Can I unshelve to a different branch in tfs 2008?

When creating a new build in Team Foundation Server, I get the following error when attempting to run the new build:

&gt; The path
&gt; C:\Build\ProductReleases\FullBuildv5.4.2x\Sources
&gt; is already mapped to workspace
&gt; BuildServer_23.

I am unable to see a workspace by that name in the workspaces dialog.

Team Build Error: The Path ... is already mapped to workspace 

I added a project to an existing solution that is currently under source control using TFS, but for some reason I cannot check in the new project.  When I view my pending changes, none of the files in the new project show up.  None of the files have a plus (for a new file) next to them.  What did I do wrong?  How do I fix it?  It&#39;s time to check in.

Adding a new project to an existing solution in TFS

Someone left the organisation but before leaving, he locked all the files for an unknown reason. 

How do you unlock them all so that the other developers can work?

What do you do if the file in TFS is locked by someone else?

Is there a way to set &quot;work offline&quot; in TFS without having to try opening a solution, waiting for it to time out, and then having Visual Studio work out that it has failed?

It seems a touch ridiculous that I can&#39;t just tick a box to tell it myself, seeing as I&#39;m probably the one most qualified to know when I&#39;m not in the office!

Work offline in Team Foundation Server

The scenario is:

 1. svn cp or mv some file
 2. modify that file
 3. svn diff &gt; mypatch

On other machine (same working copy, but no changes):

 4. Try to apply mypatch.
 5. Fail -&gt; tries to modify unexistant file.

How can I make svn diff produce patch-appliable patch, or cleanly apply patch produced by svn diff in this case? I can&#39;t commit. I would like to preserve mergeinfo (because the obvious workaround is to add the file as totally new, without connection to the previous one).

How to make svn diff produce file that patch would apply, when svn cp or svn mv was used?

There are plenty of programs out there that can create a diff patch, but I&#39;m having a heck of a time trying to apply one. I&#39;m trying to distribute a patch, and I got a question from a user about how to apply it. So I tried to figure it out on my own and found out that I have no clue, and most of the tools I can find are command-line. (I can handle a command line, but a lot of people would be lost without a nice, friendly GUI. So those are no good for this purpose.)

I tried using TortoiseSVN. I have the patch I&#39;d like to apply. I right-click on the patch, and there&#39;s an option under the TortoiseSVN submenu that says &quot;Apply patch.&quot; All it does is pull up an empty window.

So I tried hitting Open. It has two options: merge and apply unified diff. (The patch is in unified diff format, luckily.) But the apply option just plain doesn&#39;t work: It asks for the patch and a folder. Somehow it forgot to ask for the *file to apply the patch to!* So TortoiseSVN just plain doesn&#39;t work. Is there a Windows GUI-based utility that will take a patch and a file and apply it properly?

EDIT: Looking at the replies so far, it seems that Tortoise will only do it right if it&#39;s a file that&#39;s already versioned. That&#39;s not the case here. I need to be able to apply a patch to a file that did not come out of an SVN repository. I just tried using Tortoise, because I happen to know that SVN uses diffs and has to know how to both create them and apply them.


How do I apply a diff patch on Windows?

I&#39;ve got eight commits on a branch that I&#39;d like to email to some people who aren&#39;t git enlightened, yet.  So far, everything I do either gives me 8 patch files, or starts giving me patch files for every commit in the branch&#39;s history, since the beginning of time.  I used git rebase --interactive to squash the commits, but now everything I try gives me zillions of patches from the beginning of time.  What am I doing wrong?

&lt;!-- language: lang-sh --&gt;

    git format-patch master HEAD # yields zillions of patches, even though there&#39;s 
                                 # only one commit since master

How do you squash commits into one patch with git format-patch?

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).

Thank you.

How to apply SVN diff to Git?

I have two repositories, one is the main repo for a library, and the other is a project using that library.

If I make a fix to the in the subservient project, I&#39;d like an easy way to apply that patch back upstream.

The file&#39;s location is different in each repository.

* Main repo: ***`www.playdar.org/static/playdar.js`***
* Project: ***`playlick.com/lib/playdar.js`***

I tried using `git format-patch -- lib/playdar.js` on the playlick project, and then `git am` on the main playdar repo, but the differing file locations in the patch file raised an error.

Is there an easy way to apply the patch from a given commit on a given file to another arbitrary file elsewhere?

For bonus points, what if the file you want to apply the patch to isn&#39;t in a git repository?

Content Type	Original Author	Original Content on Stackoverflow
Question	swilliams	View Question on Stackoverflow
Solution 1 - Version Control	Curt Hagenlocher	View Answer on Stackoverflow
Solution 2 - Version Control	jwanagel	View Answer on Stackoverflow
Solution 3 - Version Control	Greg Bray	View Answer on Stackoverflow

Creating a Patch with TFS

Version Control Problem Overview

Version Control Solutions

Solution 1 - Version Control

Solution 2 - Version Control

Solution 3 - Version Control

What are the core mathematical concepts a good developer should know?

Templates of Technical and Functional Specs

Attributions