[Koha-bugs] [Bug 5911] Transport Cost Matrix of transporting an item between branches

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

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

Chris Cormack <chris at bigballofwax.co.nz> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Patch doesn't apply         |Needs Signoff

--- Comment #47 from Chris Cormack <chris at bigballofwax.co.nz> ---
(In reply to comment #45)
> > So it went fine here. can you please tell me how you tried to apply it?
> 
> I used 'git qa 5911' which is the same as 'git fetch origin && git checkout
> origin/master -b bug5911-qa && git bz apply 5911'

And does your git bz do a 3 way merge, if not it will report these errors.
When a 3 way merge will either merge cleanly, or actually tell you where the
error is.

What I do is git bz apply, if it fails it leaves the patch in /tmp

git am --abort 
To clean out the apply in process

git am -iu3 /tmp/path_to_patch   (git bz will tell you this path)

Then if it results in conflicts (which this one doesnt, it merges cleanly)
It will tell you the conflicts and you can paste that in.

However what has occured here, is that srdjan forgot to obsolete the old
patches, so you were trying to apply ones that are now out of date in and in
the wrong order. git bz doesn't understand stuff like that.

Ill tidy up the attachments, and then you should be good to go.

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are watching all bug changes.