[koha-commits] main Koha release repository branch 19.05.x updated. v19.05.10-117-g1738ecc1fe

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 19.05.x has been updated
       via  1738ecc1fe75c3757ce21b2bb63dfaea2f816343 (commit)
       via  bcbabb76937f0fb7dd49ffb188841c16d6906aef (commit)
       via  b5807429f7b75f9a3e5020abecfb4afb135dcc17 (commit)
      from  6d4934ed28fc45553ea8bc1e3efb64b6281a8e0e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1738ecc1fe75c3757ce21b2bb63dfaea2f816343
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri May 8 06:46:59 2020 +0000

    Bug 22437: (follow-up) Move deletion of merge requests to DelAuthority
    
    Lines can be moved. Deletion can be done too if skip_merge is not set.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
    (cherry picked from commit 2cb01116ee3ed6ce6296cb0ad5e794fd68e58f8a)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit bcbabb76937f0fb7dd49ffb188841c16d6906aef
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Apr 3 08:55:45 2020 +0000

    Bug 22437: Delete older merge requests at new merge time
    
    If you merge A to B, we should remove older AA merges (regular
    merge to itself) in the queue before deleting A.
    
    Test plan:
    [1] Set merge limit in prefs to say X.
    [2] Find three authorities A, B, C with linkcount >X, >X, <X.
    [3] Merge C to B. This creates a 'BB merge' in the queue.
        Auth C is deleted.
    [4] Merge B to A. Creating AA and BA in the queue.
        Auth B is deleted.
        Optionally verify that BB is no longer in the queue.
    [5] Run the merge_authorities.pl cron job.
        Verify that the linkcount to A is the former total of ABC.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Phil Ringnalda <philringnalda at gmail.com>
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
    (cherry picked from commit 08aa52c8315c7bec6df9800101c61591892d07dd)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit b5807429f7b75f9a3e5020abecfb4afb135dcc17
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Apr 6 13:44:46 2020 +0000

    Bug 22437: Add test case to Merge.t
    
    Test proves now that a 'destructive merge' is removed by
    DelAuthority.
    
    Test plan:
    Run t/db_dependent/Authority/Merge.t. Should fail when you
    do not apply the other two patches and pass with them.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
    (cherry picked from commit c748b95d57ef625e77742785f8ced5369b326787)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

-----------------------------------------------------------------------

Summary of changes:
 C4/AuthoritiesMarc.pm            |  7 ++++++-
 authorities/merge.pl             |  4 ++--
 t/db_dependent/Authority/Merge.t | 15 ++++++++++++++-
 3 files changed, 22 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository