diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-04-10 18:05:19 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-04-10 18:05:19 +0000 |
commit | 3cb64d20c41b325309b799e9480ae4c21c199801 (patch) | |
tree | c7d67fc9759d3c350b5be9e5ddeeff214709ec8a /vmacs.txt | |
parent | 2021-04-10T17:45:01Z (diff) | |
download | repos-3cb64d20c41b325309b799e9480ae4c21c199801.tar.gz repos-3cb64d20c41b325309b799e9480ae4c21c199801.tar.bz2 repos-3cb64d20c41b325309b799e9480ae4c21c199801.zip |
2021-04-10T18:00:01Z
Diffstat (limited to 'vmacs.txt')
-rw-r--r-- | vmacs.txt | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/vmacs.txt b/vmacs.txt index 4562b07540f3..a23697a8d284 100644 --- a/vmacs.txt +++ b/vmacs.txt @@ -13,7 +13,6 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/vmacs.git'}], 'status': 'unofficial'} $ pmaint sync vmacs -WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). *** syncing vmacs warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following @@ -28,14 +27,7 @@ preference for all repositories. You can also pass --rebase, --no-rebase, or --ff-only on the command line to override the configured default per invocation. -From https://anongit.gentoo.org/git/user/vmacs - f80b6e3..2367ca8 master -> origin/master -Updating f80b6e3..2367ca8 -Fast-forward - dev-db/phpmyadmin/Manifest | 4 ++-- - .../phpmyadmin/{phpmyadmin-5.0.4.ebuild => phpmyadmin-5.1.0.ebuild} | 0 - 2 files changed, 2 insertions(+), 2 deletions(-) - rename dev-db/phpmyadmin/{phpmyadmin-5.0.4.ebuild => phpmyadmin-5.1.0.ebuild} (100%) +Already up to date. *** synced vmacs * Sync succeeded $ git log --format=%ci -1 |