From e33cd2177cdc87b735a38a633f638b6c1b13e406 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 23 Oct 2020 13:06:50 +0000 Subject: 2020-10-23T13:00:01Z --- pixlra.html | 56 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 27 deletions(-) (limited to 'pixlra.html') diff --git a/pixlra.html b/pixlra.html index 88e2ba58fd35..b09785c95c24 100644 --- a/pixlra.html +++ b/pixlra.html @@ -44,59 +44,61 @@ 17
 'status': 'unofficial'}
 
- 18
 * Adding new repository
+            18
$ pmaint sync pixlra
 
- 19
$ pmaint sync pixlra
+            19
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 
- 20
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).
+            20
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 
- 21
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 
- 22
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 
- 23
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:mozilla repo at '/var/lib/repo-mirror-ci/sync/mozilla', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 
- 24
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 
- 25
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
warning: Pulling without specifying how to reconcile divergent branches is
 
- 26
WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
discouraged. You can squelch this message by running one of the following
 
- 27
WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
commands sometime before your next pull:
 
- 28
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 
- 29
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).
+            29
  git config pull.rebase false  # merge (the default strategy)
 
- 30
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
  git config pull.rebase true   # rebase
 
- 31
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
  git config pull.ff only       # fast-forward only
 
- 32
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 
- 33
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
You can replace "git config" with "git config --global" to set a default
 
- 34
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
preference for all repositories. You can also pass --rebase, --no-rebase,
 
- 35
WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
or --ff-only on the command line to override the configured default per
 
- 36
WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
invocation.
 
- 37
Cloning into '/var/lib/repo-mirror-ci/sync/pixlra'...
+            37
 
- 38
*** syncing pixlra
+            38
Already up to date.
 
- 39
*** synced pixlra
+            39
*** syncing pixlra
 
- 40
 * Sync succeeded
+            40
*** synced pixlra
 
- 41
$ git log --format=%ci -1
+            41
 * Sync succeeded
 
- 42
$ git show -q --pretty=format:%G? HEAD
+            42
$ git log --format=%ci -1
 
- 43
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pixlra
+            43
$ git show -q --pretty=format:%G? HEAD
 
- 44
 * Cache regenerated successfully
+            44
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pixlra
+
+ 45
 * Cache regenerated successfully
 
-- cgit v1.2.3-65-gdbad