diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-23 12:36:44 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-23 12:36:44 +0000 |
commit | 8fc0b36519bab0c859d80f139bc0c8715e865c7e (patch) | |
tree | cee8f9cae627d27500b039fe53e53f890214c45f /emacs.txt | |
parent | 2020-10-23T09:30:01Z (diff) | |
download | repos-8fc0b36519bab0c859d80f139bc0c8715e865c7e.tar.gz repos-8fc0b36519bab0c859d80f139bc0c8715e865c7e.tar.bz2 repos-8fc0b36519bab0c859d80f139bc0c8715e865c7e.zip |
2020-10-23T12:00:01Z
Diffstat (limited to 'emacs.txt')
-rw-r--r-- | emacs.txt | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/emacs.txt b/emacs.txt index 5a28747499b0..8f5b757d146d 100644 --- a/emacs.txt +++ b/emacs.txt @@ -16,21 +16,16 @@ {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/repo/proj/emacs.git'}], 'status': 'official'} + * Adding new repository $ pmaint sync emacs -warning: Pulling without specifying how to reconcile divergent branches is -discouraged. You can squelch this message by running one of the following -commands sometime before your next pull: - - git config pull.rebase false # merge (the default strategy) - git config pull.rebase true # rebase - git config pull.ff only # fast-forward only - -You can replace "git config" with "git config --global" to set a default -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. +WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +Cloning into '/var/lib/repo-mirror-ci/sync/emacs'... *** syncing emacs *** synced emacs * Sync succeeded |