Geek asks and answers

Tfs. header line mismatch with patch command

I am trying to create a diff file (patch file) and apply this patch to some already deployed folder. I run the following command to create a diff file:

tf diff version.asp /format:unified > C:\patch.diff

It generates something like:

Comparing local to latest: C:\dev\folder\version.asp File: version.asp ===================================================================

--- version.asp (local) 2011-06-17 09:18 text, after the file name, should not be here

+++ version.asp; 958 (server) 2011-09-19 14:27 the same here

@@ -13,7 +13,7 @@
'============================================================
Dim APP_VERSION, APP_BUILD, APP_DATE  
APP_VERSION = 6
-APP_BUILD = 45
+APP_BUILD = 52
%>
\ No newline at end of file
============================================================

. - UNIX , . , . : diff tf diff , ?

, , regex , .

UPDATE

regex, , Unix sed, Windows MinGW.

sed "s/^\(+++\|---\)\(.*\)\(\.[A-Za-z0-9]\{1,4\}\)\(.*\)$/\1\2\3/" C:\patch.diff > C:\patch.new

patch.diff - , tfs, patch.new - diff patch

UPDATE2

, , diff, tfs Unicode ASCII.

, , ä letter, diff a.

diff, tfs, .

.

FYI: vs2010 Team Foundation Server 2010.

+5
2

, . TFS /unified.

, git:

(shelve change set)
tfpt scorch
git init 
git add .
git commit -a -m "Original"
git checkout -b "New"
(checkout shelf in tfs)
git add . 
git commit -a -m "Change"
git format-patch master

:/

+1

tf diff /format:unified diff -u patch, , Microsoft

, .

+1

More articles:


All Articles