Date: Tue, 09 Apr 2024 18:41:12 +0200 From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org Cc: dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 2e435f459ff0 - main - x11-servers/xwayland-devel: drop HiDPI patches to unblock updates Message-ID: <4jca-qyjb-wny@FreeBSD.org> In-Reply-To: <202404091605.439G5SdT042027@gitrepo.freebsd.org> (Jan Beich's message of "Tue, 9 Apr 2024 16:05:28 GMT") References: <202404091605.439G5SdT042027@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Jan Beich <jbeich@FreeBSD.org> writes: > The branch main has been updated by jbeich: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=2e435f459ff0a25e517011514c441c2a437ed79c > > commit 2e435f459ff0a25e517011514c441c2a437ed79c > Author: Jan Beich <jbeich@FreeBSD.org> > AuthorDate: 2024-04-09 15:18:03 +0000 > Commit: Jan Beich <jbeich@FreeBSD.org> > CommitDate: 2024-04-09 16:05:20 +0000 > > x11-servers/xwayland-devel: drop HiDPI patches to unblock updates > > - Rootful HiDPI[1] introduces non-trivial conflicts to rootless HiDPI > - AUR tracks Xwayland releases, so cannot help with rebases > - Sway should probably adopt force_zero_scaling from Hyprland >= 0.27 > > [1] https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1197 This reverts https://cgit.freebsd.org/ports/commit/?id=dce99729d741 I've tried to adjust the reference after push but it's not allowed. $ git push --push-option=confirm-subject freebsd 'refs/notes/*' Enumerating objects: 15, done. Counting objects: 100% (15/15), done. Delta compression using up to 8 threads Compressing objects: 100% (10/10), done. Writing objects: 100% (10/10), 1002 bytes | 1002.00 KiB/s, done. Total 10 (delta 6), reused 0 (delta 0), pack-reused 0 remote: ================================================================ remote: Disallowed reference: refs/notes/commits remote: ================================================================ remote: FATAL: VREF/REFERENCE-CHECK/ports: helper program exit status 256 remote: error: hook declined to update refs/notes/commits To gitrepo-dev.FreeBSD.org:ports.git ! [remote rejected] refs/notes/commits -> refs/notes/commits (hook declined) error: failed to push some refs to 'gitrepo-dev.FreeBSD.org:ports.git'
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4jca-qyjb-wny>