Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

60936: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60809: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         60792: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2014_01_08 to BRANCHES/DEV/V4.1-BUG-FIX:
            60183: MNT-10373 : WebDAV - Repeat save of existing text documents into Alfresco on Mountain Lion loses version history
         Also, added test to RenameShuffleDetectionTest.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62371 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 14:43:06 +00:00
parent dfa6af3f08
commit 765dbc4c41
2 changed files with 2 additions and 1 deletions

View File

@@ -83,6 +83,7 @@ public class RenameShuffleDetectionTest
{ "/some/parent/ab0c1d2ef3456789", true},
{ "aaaaaaaa", true },
{ "abcdef01", true },
{ "1234567890.txt.sb-764f0c5c-JUoEKy", true }, // MNT-10373 test for TextEdit shuffle
// Photoshop (MNT-8971)
{ "/psC1DA.tmp", true },
{ "/path/psA1B5.tmp", true }