[zanata/zanata-server] 16b295: Implement merge translation from and to existing v...

[GitHub]

  Branch: refs/heads/rhbz1133989
  Home:   https://github.com/zanata/zanata-server
  Commit: 16b295dbc94eaa458c63b94d86b78f2f199ac122
      https://github.com/zanata/zanata-server/commit/16b295dbc94eaa458c63b94d86b78f2f199ac122
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    A zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    A zanata-war/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    A zanata-war/src/main/java/org/zanata/service/MergeTranslationsService.java
    A zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsWork.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml

  Log Message:
  -----------
  Implement merge translation from and to existing version: https://bugzilla.redhat.com/show_bug.cgi?id=1133989