[zanata/zanata-server] 218421: fix(ZNTA-987): track deleted HTextFlowTargets by I...

[GitHub]

  Branch: refs/heads/release
  Home:   https://github.com/zanata/zanata-server
  Commit: 218421be027fa08f7b8a686c966ff1265be36207
      https://github.com/zanata/zanata-server/commit/218421be027fa08f7b8a686c966ff1265be36207
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2016-04-06 (Wed, 06 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/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
    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).

Fixes the bug where merge-type=import sets state of HTextFlowTargets
to New.