https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25193

Jonathan Druart <[email protected]> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Patch doesn't apply         |Signed Off

--- Comment #29 from Jonathan Druart <[email protected]> ---
Used the auto_rebase.pl script to rebase this patch

$ export BUG_NUMBER=25193; perl auto_rebase.pl --bugzilla $BUG_NUMBER
Creating a temporary branch 'bug_25193-tmp'...
Guessing a date to use from bugzilla's bug 25193
First patch from this bug was applied at 2024-12-15T19:19:58Z
Resetting HEAD to where origin/main was at 2024-12-15T19:19:58Z (commit
1a4820322e528fdea4ac6dd212254ca3021d30a2)
Applying patches using git bz
Rebasing the temporary branch up to before the tidy commits...
Creating a new branch 'bug_25193-rebased' starting at the end of the tidy
commits...
Getting commit list from branch 'bug_25193-tmp'...
No number of commits passed, trying to guess it...
Found 1 commits to process
Processing 1 commits...
        Processing commit 1ae15053a9b... (1/1)
                Processing file C4/Circulation.pm... (1/5)
Tidying file 1/1 (C4/Circulation.pm)
                Processing file
installer/data/mysql/atomicupdate/bug_25193-add_AllowRenewalIfOtherItemsAvailableLocation_syspref.pl...
(2/5)
Tidying file 1/1
(installer/data/mysql/atomicupdate/bug_25193-add_AllowRenewalIfOtherItemsAvailableLocation_syspref.pl)
                Processing file installer/data/mysql/mandatory/sysprefs.sql...
(3/5)
Tidying file 1/1 (installer/data/mysql/mandatory/sysprefs.sql)
Cannot guess filetype for installer/data/mysql/mandatory/sysprefs.sql at
/tmp/FKRVdWhW6W line 191.
                Processing file
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref...
(4/5)
Tidying file 1/1
(koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref)
Cannot guess filetype for
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref at
/tmp/FKRVdWhW6W line 191.
                Processing file t/db_dependent/Circulation.t... (5/5)
Tidying file 1/1 (t/db_dependent/Circulation.t)
                Committing changes...

All commits from the source branch have been applied to 'bug_25193-rebased'!


Rebasing on top of main...
Everything applied successfully!

-- 
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
[email protected]
https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

Reply via email to