Mercurial > hg > extraction-interface

diff develop/views/Extractapp/TaggingText.php @ 42:c245d54eab9f extractapp

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
config lg server url, without port
author Zoe Hong <zhong@mpiwg-berlin.mpg.de>
date Thu, 12 Mar 2015 17:33:30 +0100
parents 2e938dc046db
children b3ca5d2b4d3f
line wrap: on
line diff
--- a/develop/views/Extractapp/TaggingText.php	Tue Mar 10 14:13:21 2015 +0100
+++ b/develop/views/Extractapp/TaggingText.php	Thu Mar 12 17:33:30 2015 +0100
@@ -87,6 +87,9 @@
     
     if (info['current_fileId'] != 0 && info['current_fileId'] != info['file_id']){
         // -- there might be conflicts between different version
+        alert("Someone edited this file and saved before you.");
+        return;
+
         var retVal = confirm('There were something happened/someone editing in the between of time.\nDo you want to force saving? (There might be conflicts between two versions.)');
         if( retVal == true ){
             // TODO: force saving with currentFileId
@@ -151,6 +154,7 @@
             */
             
         }
+
     }
     return;