[Koha-bugs] [Bug 7091] Patches required to make the packages know about the 3.6 release

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Wed Nov 23 06:13:44 CET 2011


http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7091

Robin Sheat <robin at catalyst.net.nz> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
       Patch Status|Does not apply              |Passed QA

--- Comment #11 from Robin Sheat <robin at catalyst.net.nz> 2011-11-23 05:13:44 UTC ---
The 3.6.x patch set also applies:

robin at zarathud:~/catalyst/koha$ git checkout kc/3.6.x
HEAD is now at 16189ed... Joy nelson was already in history.txt, removing the
entry (cherry picked from commit 9c5d3ea3aa28b71f0fb4148b8fdf9f2a002f79f5)
robin at zarathud:~/catalyst/koha$ git bz apply 7091
Bug 7091 - Patches required to make the packages know about the 3.6 release

Bug 7091 - [3.6.x] - update the build script for 3.6 stable series
Apply? [yn] y

Applying: Bug 7091 - [3.6.x] - update the build script for 3.6 stable series
Bug 7091 - [MASTER] - update the build version for packages from master
Apply? [yn] n
Bug 7091 - [MASTER/3.6.x/3.4.x] - update the changelogs for the 3.4 series
Apply? [yn] y

Applying: Bug 7091 - [MASTER/3.6.x/3.4.x] - update the changelogs for the 3.4
series
/home/robin/catalyst/koha/.git/rebase-apply/patch:12: trailing whitespace.
  * New upstream release (3.04.05) 
/home/robin/catalyst/koha/.git/rebase-apply/patch:24: trailing whitespace.
  * New upstream release (3.04.03) 
warning: 2 lines add whitespace errors.



... I suspect you were trying to apply all the patches, not the ones for the
particular branches?

-- 
Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA Contact for the bug.
You are watching all bug changes.


More information about the Koha-bugs mailing list