inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes the behavior of submit to clobber when there are conflicts, so that

Browse Source 
Preview I evaluators never get into a situation they can't get out of.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4083 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-10-09 19:53:57 +00:00
parent fb41867805
commit 446343b697
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java
View File

@@ -116,7 +116,7 @@ public class SimpleAVMSubmitAction extends ActionExecuterAbstractBase
List<AVMDifference> diffs =
fAVMSyncService.compare(version, path, -1, avmDest);
// Do the update.
fAVMSyncService.update(diffs, true, true, false, false);
fAVMSyncService.update(diffs, false, false, true, true);
// Cleanup by flattening the source relative to the destination.
AVMDAOs.Instance().fAVMNodeDAO.flush();
fAVMSyncService.flatten(storePath[0] + ":/appBase", websiteName + "-staging:/appBase");