Login | Register
My pages Projects Community openCollabNet

Discussions > commits > svn commit: r66 - branches/SOPTIM/src/tsvnWizard.pas

delphiaddinfortortoisesvn
Discussion topic

Hide all messages in topic

All messages in topic

svn commit: r66 - branches/SOPTIM/src/tsvnWizard.pas

Author otto_noll
Full name Otto Noll
Date 2009-01-12 06:29:52 PST
Message Author: otto_noll
Date: 2009-01-12 06:29:51-0800
New Revision: 66

Modified:
   branches/SOPTIM/src/​tsvnWizard.pas

Log:
Add "Merge" to the Menu

Modified: branches/SOPTIM/src/​tsvnWizard.pas
Url: http://delphiaddinfo​rtortoisesvn.tigris.​org/source/browse/de​lphiaddinfortortoise​svn/branches/SOPTIM/​src/tsvnWizard.pas?v​iew=diff&pathrev​=66&r1=65&r2​=66
====================​====================​====================​==================
--- branches/SOPTIM/src/​tsvnWizard.pas (original)
+++ branches/SOPTIM/src/​tsvnWizard.pas 2009-01-12 06:29:51-0800
@@ -19,6 +19,7 @@
         SVN_CREATE_PATCH_SANDBOX,
         SVN_GRAPH_SANDBOX,
         SVN_LOCK_SANDBOX,
+ SVN_MERGE_SANDBOX,
         SVN_REVERT_SANDBOX,
         SVN_REPOSITORY_BROWSER,
         SVN_SETTINGS,
@@ -369,6 +370,8 @@
             Result:= 'revisiongraph';
         SVN_LOCK_SANDBOX :
             Result := 'lock';
+ SVN_MERGE_SANDBOX :
+ Result := 'merge';
         SVN_DIFF:
             Result:= 'diff';
         SVN_REVERT_SANDBOX:
@@ -443,6 +446,8 @@
             Result := 'Revisiongraph,...';
         SVN_LOCK_SANDBOX :
             Result := 'Lock...';
+ SVN_MERGE_SANDBOX :
+ Result := 'Merge...';
         SVN_DIFF:
             Result:= '&Diff...';
         SVN_REVERT_SANDBOX:
@@ -525,6 +530,9 @@
         SVN_LOCK_SANDBOX :
             if GetCurrentProject <> nil then
               Result := vsEnabled;
+ SVN_MERGE_SANDBOX :
+ if GetCurrentProject <> nil then
+ Result := vsEnabled;
         SVN_ADD:
             ;// this verb state is updated by TTortoiseSVN.CheckOn_Popup
         SVN_BLAME:
@@ -682,6 +690,9 @@
                 TSVNExec( '/command:lock /notempfile /path:' + AnsiQuotedStr( ExtractFilePath(proj​ect.GetFileName), '"' ) );
                 ReloadAllProjectfiles();
             end;
+ SVN_MERGE_SANDBOX :
+ if project <> nil then
+ TSVNExec( '/command:merge /notempfile /path:' + AnsiQuotedStr( ExtractFilePath(proj​ect.GetFileName), '"' ) );
         SVN_ADD:
             if project <> nil then
             begin
Messages per page: