• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision16007 (tree)
Zeit2009-04-02 03:54:32
Autorstefankueng

Log Message

Merge r16006 from trunk:
* Reset the read-only attribute when diffing OO files.

Ändern Zusammenfassung

Diff

--- branches/1.6.x/Languages/Tortoise_ca_ES.po (revision 16006)
+++ branches/1.6.x/Languages/Tortoise_ca_ES.po (revision 16007)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_ca_ES.po:r16006
--- branches/1.6.x/Languages/Tortoise_da.po (revision 16006)
+++ branches/1.6.x/Languages/Tortoise_da.po (revision 16007)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_da.po:r16006
--- branches/1.6.x/Languages/Tortoise_es.po (revision 16006)
+++ branches/1.6.x/Languages/Tortoise_es.po (revision 16007)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_es.po:r16006
--- branches/1.6.x/Languages/Tortoise_it.po (revision 16006)
+++ branches/1.6.x/Languages/Tortoise_it.po (revision 16007)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_it.po:r16006
--- branches/1.6.x/Languages/Tortoise_nb.po (revision 16006)
+++ branches/1.6.x/Languages/Tortoise_nb.po (revision 16007)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_nb.po:r16006
--- branches/1.6.x/Languages/Tortoise_pt_PT.po (revision 16006)
+++ branches/1.6.x/Languages/Tortoise_pt_PT.po (revision 16007)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_pt_PT.po:r16006
--- branches/1.6.x/Languages/Tortoise_sv.po (revision 16006)
+++ branches/1.6.x/Languages/Tortoise_sv.po (revision 16007)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_sv.po:r16006
--- branches/1.6.x/contrib/other/diff-scripts/diff-ods.vbs (revision 16006)
+++ branches/1.6.x/contrib/other/diff-scripts/diff-ods.vbs (revision 16007)
@@ -1,7 +1,7 @@
11 '
22 ' TortoiseSVN Diff script for Open Office Calc files
33 '
4-' Copyright (C) 2004-2008 the TortoiseSVN team
4+' Copyright (C) 2004-2009 the TortoiseSVN team
55 ' This file is distributed under the same license as TortoiseSVN
66 '
77 ' Last commit by:
@@ -11,7 +11,7 @@
1111 '
1212 ' Authors:
1313 ' Jonathan Ashley, 2007
14-' Stefan Küng, 2006
14+' Stefan Küng, 2006, 2009
1515 '
1616 dim objArgs,num,sBaseDoc,sNewDoc,objScript,word,destination
1717
@@ -35,6 +35,10 @@
3535 Wscript.Quit 1
3636 End If
3737
38+'remove the file write protection
39+objScript.GetFile(sBaseDoc).Attributes = objScript.GetFile(sBaseDoc).Attributes And Not 1
40+objScript.GetFile(sNewDoc).Attributes = objScript.GetFile(sNewDoc).Attributes And Not 1
41+
3842 Set objScript = Nothing
3943
4044 On Error Resume Next
--- branches/1.6.x/contrib/other/diff-scripts/diff-odt.vbs (revision 16006)
+++ branches/1.6.x/contrib/other/diff-scripts/diff-odt.vbs (revision 16007)
@@ -1,7 +1,7 @@
11 '
22 ' TortoiseSVN Diff script for Open Office Text files
33 '
4-' Copyright (C) 2004-2008 the TortoiseSVN team
4+' Copyright (C) 2004-2009 the TortoiseSVN team
55 ' This file is distributed under the same license as TortoiseSVN
66 '
77 ' Last commit by:
@@ -11,7 +11,7 @@
1111 '
1212 ' Authors:
1313 ' Jonathan Ashley, 2007
14-' Stefan Küng, 2006
14+' Stefan Küng, 2006, 2009
1515 '
1616 dim objArgs,num,sBaseDoc,sNewDoc,objScript,word,destination
1717
@@ -34,6 +34,9 @@
3434 MsgBox "File " + sNewDoc +" does not exist. Cannot compare the documents.", vbExclamation, "File not found"
3535 Wscript.Quit 1
3636 End If
37+'remove the file write protection
38+objScript.GetFile(sBaseDoc).Attributes = objScript.GetFile(sBaseDoc).Attributes And Not 1
39+objScript.GetFile(sNewDoc).Attributes = objScript.GetFile(sNewDoc).Attributes And Not 1
3740
3841 Set objScript = Nothing
3942
--- branches/1.6.x/contrib/other/diff-scripts/merge-ods.vbs (revision 16006)
+++ branches/1.6.x/contrib/other/diff-scripts/merge-ods.vbs (revision 16007)
@@ -1,7 +1,7 @@
11 '
22 ' TortoiseSVN Merge script for Open Office Calc files
33 '
4-' Copyright (C) 2004-2008 the TortoiseSVN team
4+' Copyright (C) 2004-2009 the TortoiseSVN team
55 ' This file is distributed under the same license as TortoiseSVN
66 '
77 ' Last commit by:
@@ -11,7 +11,7 @@
1111 '
1212 ' Authors:
1313 ' Jonathan Ashley, 2007
14-' Stefan Küng, 2006
14+' Stefan Küng, 2006, 2009
1515 '
1616 dim objArgs,num,sBaseDoc,sMergedDoc,sTheirDoc,sMyDoc,objScript,word,destination
1717
@@ -36,6 +36,9 @@
3636 MsgBox "File " + sTheirDoc +" does not exist. Cannot compare the documents.", vbExclamation, "File not found"
3737 Wscript.Quit 1
3838 End If
39+'remove the file write protection
40+objScript.GetFile(sMyDoc).Attributes = objScript.GetFile(sMyDoc).Attributes And Not 1
41+objScript.GetFile(sTheirDoc).Attributes = objScript.GetFile(sTheirDoc).Attributes And Not 1
3942
4043 Set objScript = Nothing
4144
--- branches/1.6.x/contrib/other/diff-scripts/merge-odt.vbs (revision 16006)
+++ branches/1.6.x/contrib/other/diff-scripts/merge-odt.vbs (revision 16007)
@@ -1,7 +1,7 @@
11 '
22 ' TortoiseSVN Merge script for Open Office Text files
33 '
4-' Copyright (C) 2004-2008 the TortoiseSVN team
4+' Copyright (C) 2004-2009 the TortoiseSVN team
55 ' This file is distributed under the same license as TortoiseSVN
66 '
77 ' Last commit by:
@@ -11,7 +11,7 @@
1111 '
1212 ' Authors:
1313 ' Jonathan Ashley, 2007
14-' Stefan Küng, 2006
14+' Stefan Küng, 2006, 2009
1515 '
1616
1717 dim objArgs,num,sBaseDoc,sMergedDoc,sTheirDoc,sMyDoc,objScript,word,destination
@@ -38,6 +38,10 @@
3838 Wscript.Quit 1
3939 End If
4040
41+'remove the file write protection
42+objScript.GetFile(sMyDoc).Attributes = objScript.GetFile(sMyDoc).Attributes And Not 1
43+objScript.GetFile(sTheirDoc).Attributes = objScript.GetFile(sTheirDoc).Attributes And Not 1
44+
4145 Set objScript = Nothing
4246
4347 On Error Resume Next
--- branches/1.6.x/contrib/other/diff-scripts/merge-sxw.vbs (revision 16006)
+++ branches/1.6.x/contrib/other/diff-scripts/merge-sxw.vbs (revision 16007)
@@ -1,7 +1,7 @@
11 '
22 ' TortoiseSVN Merge script for Open Office Writer files
33 '
4-' Copyright (C) 2004-2008 the TortoiseSVN team
4+' Copyright (C) 2004-2009 the TortoiseSVN team
55 ' This file is distributed under the same license as TortoiseSVN
66 '
77 ' Last commit by:
@@ -11,7 +11,7 @@
1111 '
1212 ' Authors:
1313 ' Jonathan Ashley, 2007
14-' Stefan Küng, 2006
14+' Stefan Küng, 2006, 2009
1515 '
1616
1717 dim objArgs,num,sBaseDoc,sMergedDoc,sTheirDoc,sMyDoc,objScript,word,destination
@@ -37,6 +37,9 @@
3737 MsgBox "File " + sTheirDoc +" does not exist. Cannot compare the documents.", vbExclamation, "File not found"
3838 Wscript.Quit 1
3939 End If
40+'remove the file write protection
41+objScript.GetFile(sMyDoc).Attributes = objScript.GetFile(sMyDoc).Attributes And Not 1
42+objScript.GetFile(sTheirDoc).Attributes = objScript.GetFile(sTheirDoc).Attributes And Not 1
4043
4144 Set objScript = Nothing
4245
Show on old repository browser