#49589 merge svrcore into 389-ds-base
Closed by spichugi. Opened by firstyear.
firstyear/389-ds-base 49369-svrcore  into  master

Download 49589.patch

Bug Description: In order to keep our project simple and clear
it's a good idea to keep our dependencies together. As the only
consumers and maintainers of svrcore, we shouldmake it part of
our project!

Fix Description:  Merge svrcore and it's history to
389-ds-base
https://pagure.io/389-ds-base/issue/49369
[mareynol@localhost 389-ds-base]$ git apply william.patch
william.patch:667: trailing whitespace.
        file or the terminal, or systemd-ask-pass, and allows caching 
william.patch:882: trailing whitespace.
// See LICENSE for details. 
william.patch:1320: space before tab in indent.
                cache.c \
william.patch:1321: space before tab in indent.
                errors.c \
william.patch:1322: space before tab in indent.
                file.c \
error: cannot apply binary patch to 'src/svrcore/src/key.ico' without full index line
error: src/svrcore/src/key.ico: patch does not apply
error: cannot apply binary patch to 'src/svrcore/src/logo.ico' without full index line
error: src/svrcore/src/logo.ico: patch does not apply

The patch itself looks good, but I can't test it as the patch does not apply to master branch

I'm not sure this is just "one patch", this is actually a branch with git history AND a merge commit ....

You may need to pull the branch instead to test I'm sorry.

Well lets get this initially merged then, and if we find issues we can fix them in a follow up commit then.

Sure, sounds good. I'll rebase and merge then :)

Commit e6cc2780 fixes this pull-request

Pull-Request has been merged by firstyear

Pull-Request has been merged by firstyear

389-ds-base is moving from Pagure to Github. This means that new issues and pull requests
will be accepted only in 389-ds-base's github repository.

This pull request has been cloned to Github as issue and is available here:
- https://github.com/389ds/389-ds-base/issues/2648

If you want to continue to work on the PR, please navigate to the github issue,
download the patch from the attachments and file a new pull request.

Thank you for understanding. We apologize for all inconvenience.

Pull-Request has been closed by spichugi

Metadata