diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-04-10 17:50:08 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-04-10 17:50:08 +0000 |
| commit | 0e94b5fd6b33d7182b5c94394517f9aa09c7a8e5 (patch) | |
| tree | 76bb0255de3dada946cfdc020c49b74a64aa09ce /vmacs.txt | |
| parent | 2021-04-10T17:30:01Z (diff) | |
| download | repos-0e94b5fd6b33d7182b5c94394517f9aa09c7a8e5.tar.gz repos-0e94b5fd6b33d7182b5c94394517f9aa09c7a8e5.tar.bz2 repos-0e94b5fd6b33d7182b5c94394517f9aa09c7a8e5.zip | |
2021-04-10T17:45:01Z
Diffstat (limited to 'vmacs.txt')
| -rw-r--r-- | vmacs.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/vmacs.txt b/vmacs.txt index a23697a8d284..4562b07540f3 100644 --- a/vmacs.txt +++ b/vmacs.txt @@ -13,6 +13,7 @@ '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 @@ -27,7 +28,14 @@ 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. -Already up to date. +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%) *** synced vmacs * Sync succeeded $ git log --format=%ci -1 |