[zanata/zanata-server] 452dd7: Implement 'merging' of existing TUs when importing...

[GitHub]

  Branch: refs/heads/tm-import
  Home:   https://github.com/zanata/zanata-server
  Commit: 452dd75adff2fd2d3f4baa0c77365088d786cced
      https://github.com/zanata/zanata-server/commit/452dd75adff2fd2d3f4baa0c77365088d786cced
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java

  Log Message:
  -----------
  Implement 'merging' of existing TUs when importing TMX files.


  Commit: 5293647b41c5fde10adce203c2ccf01bb7f11afd
      https://github.com/zanata/zanata-server/commit/5293647b41c5fde10adce203c2ccf01bb7f11afd
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java

  Log Message:
  -----------
  Fix issues when clearing a translation memory.


Compare: https://github.com/zanata/zanata-server/compare/bbe8f454b365...5293647b41c5