[Koha-bugs] [Bug 25442] Release dates are missing from the timeline

[bugzilla-daemon at bugs.koha-community.org]

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

Magnus Enger <magnus at libriotech.no> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |magnus at libriotech.no

--- Comment #14 from Magnus Enger <magnus at libriotech.no> ---
$ git bz apply 25442
Bug 25442 - Release dates are missing from the timeline

105594 - Bug 25442: Use tags to update history

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 25442: Use tags to update history
Using index info to reconstruct a base tree...
M       docs/history.txt
Falling back to patching base and 3-way merge...
Auto-merging docs/history.txt
CONFLICT (content): Merge conflict in docs/history.txt
error: Failed to merge in the changes.
Patch failed at 0001 Bug 25442: Use tags to update history
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in /tmp/Bug-25442-Use-tags-to-update-history-SuS8Jj.patch

The most recent entry in history.txt is now this:

1598907821      August 31 2020  Koha 20.05.03 released  releases

Not sure if the point of the patch here is to change the format or method of
generating history.txt in some way, or just to update it? If it is the latter
it seems to have been bypassed by other updates.

-- 
You are receiving this mail because:
You are watching all bug changes.