[Koha-bugs] [Bug 10662] Build OAI-PMH Harvesting Client

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

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

--- Comment #123 from David Cook <dcook at prosentient.com.au> ---
(In reply to Magnus Enger from comment #122)
> (In reply to Josef Moravec from comment #121)
> > Sorry David, after applying all 3 dependencies on current master I get this
> > when applying first patch of this bug:
> > 
> > error: sha1 information is lacking or useless (debian/scripts/koha-create).
> > error: could not build fake ancestor
> 
> I get more or less the same, but with a slightly different message:
> 
> Applying: Bug 10662 - Build OAI-PMH Harvesting Client
> fatal: sha1 information is lacking or useless (debian/scripts/koha-create).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001 Bug 10662 - Build OAI-PMH Harvesting Client

I get a different message yet again:

Using index info to reconstruct a base tree...
M       debian/scripts/koha-create
Falling back to patching base and 3-way merge...
Auto-merging debian/scripts/koha-create
CONFLICT (content): Merge conflict in debian/scripts/koha-create
error: Failed to merge in the changes.
Patch failed at 0001 Bug 10662 - Build OAI-PMH Harvesting Client
The copy of the patch that failed is found in: .git/rebase-apply/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-10662---Build-OAI-PMH-Harvesting-Client-s_47Bl.patch

So it looks like a merge conflict... which is interesting since my dev branch
rebases just fine against master. I must've mucked up another commit locally
during a rebase. I'll fix this in a sec.

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