Browse Source

SYNC: [OK] master-20200330003000.log

master
HardenedBSD Sync Service 2 months ago
parent
commit
6211db065e
1 changed files with 75 additions and 0 deletions
  1. +75
    -0
      sync/master-20200330003000.log

+ 75
- 0
sync/master-20200330003000.log View File

@@ -34,3 +34,78 @@ Banner last updated: 10 Feb 2020 09:32 EST

Everything up-to-date
==== END: master ====
==== BEGIN: master ====
current branch: master
mergeable branch: freebsd/master
==== change branch ====
Already on 'master'
Your branch is up to date with 'origin/master'.
==== show current branch ====
* master
==== check for stale changes ====
==== update to latest origin ====
=============================
HardenedBSD Master git Server
=============================

Please note that connections and activity to this server are logged.
This server, git-01.md.hardenedbsd.org, acts as the source-of-truth
server for the HardenedBSD repositories.

Banner last updated: 10 Feb 2020 09:32 EST

Already up to date.
==== merge branches ====
==== merge freebsd/master branch ====
Removing games/openrct2/files/patch-bigendian
Auto-merging games/openrct2/Makefile
Removing devel/lazygit/files/patch-vendor_github.com_jesseduffield_pty_ztypes__freebsd__arm64.go
Merge made by the 'recursive' strategy.
cad/netgen-lvs/Makefile | 2 +-
cad/netgen-lvs/distinfo | 6 +-
databases/foundationdb-devel/Makefile | 4 +-
deskutils/peaclock/Makefile | 2 +-
deskutils/peaclock/distinfo | 6 +-
devel/lazygit/Makefile | 20 +-
devel/lazygit/distinfo | 42 +-
...com_jesseduffield_pty_ztypes__freebsd__arm64.go | 16 -
devel/py-molecule/Makefile | 63 +-
devel/py-molecule/distinfo | 6 +-
devel/py-molecule/files/patch-setup.py | 334 ++++++++++
devel/py-molecule/pkg-message | 9 +
games/openrct2/Makefile | 12 +-
games/openrct2/distinfo | 14 +-
games/openrct2/files/patch-bigendian | 707 ---------------------
games/retroarch/Makefile | 2 +-
graphics/gmic/Makefile | 3 +-
graphics/gmic/distinfo | 6 +-
math/ensmallen/Makefile | 6 +-
math/ensmallen/distinfo | 6 +-
security/wpa_supplicant/Makefile | 25 +-
sysutils/auto-admin/Makefile | 2 +-
sysutils/auto-admin/distinfo | 6 +-
23 files changed, 482 insertions(+), 817 deletions(-)
delete mode 100644 devel/lazygit/files/patch-vendor_github.com_jesseduffield_pty_ztypes__freebsd__arm64.go
create mode 100644 devel/py-molecule/files/patch-setup.py
create mode 100644 devel/py-molecule/pkg-message
delete mode 100644 games/openrct2/files/patch-bigendian
=============================
HardenedBSD Master git Server
=============================

Please note that connections and activity to this server are logged.
This server, git-01.md.hardenedbsd.org, acts as the source-of-truth
server for the HardenedBSD repositories.

Banner last updated: 10 Feb 2020 09:32 EST

remote: From github.com:HardenedBSD/hardenedbsd-ports
remote: 4727378d6fec..25c0609cfac5 master -> github/master
remote: To github.com:HardenedBSD/hardenedbsd-ports.git
remote: ! [rejected] master -> master (atomic push failed)
remote: ! [rejected] github/master -> github/master (atomic push failed)
remote: ! [remote rejected] refs/pull/2/head -> refs/pull/2/head (deny updating a hidden ref)
remote: error: failed to push some refs to 'git@github.com:HardenedBSD/hardenedbsd-ports.git'
To git-01.md.hardenedbsd.org:HardenedBSD/hardenedbsd-ports.git
25c0609cfac5..9e106b0c8149 master -> master
==== END: master ====

Loading…
Cancel
Save