[zanata/zanata-server] 0f16ef: WIP

[GitHub]

  Branch: refs/heads/ZNTA-987-import-bug
  Home:   https://github.com/zanata/zanata-server
  Commit: 0f16efc0b587ad2c0c53051195a79c247314aeb8
      https://github.com/zanata/zanata-server/commit/0f16efc0b587ad2c0c53051195a79c247314aeb8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2016-03-31 (Thu, 31 Mar 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeAuto.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeFirstTran.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeImport.java

  Log Message:
  -----------
  WIP


  Commit: 9a77b37ed4e04daae46884e8fbf12ccc5be91450
      https://github.com/zanata/zanata-server/commit/9a77b37ed4e04daae46884e8fbf12ccc5be91450
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2016-04-01 (Fri, 01 Apr 2016)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-war/src/main/java/org/zanata/service/TranslationMergeService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeFirstTran.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java

  Log Message:
  -----------
  fix(ZNTA-987): track deleted HTextFlowTargets by ID

The equals method for HTextFlowTargets won't recognise the object if
any fields have changed, so tracking by ID is safer (unless we implement
business key equality).


Compare: https://github.com/zanata/zanata-server/compare/0f16efc0b587^...9a77b37ed4e0