From be3def55c8643a8c9b9683f7c826e3601005ada9 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 23 Oct 2020 17:35:53 +0000 Subject: 2020-10-23T17:30:01Z --- dMaggot.html | 72 ++++++++++++++++++++---------------------------------------- 1 file changed, 24 insertions(+), 48 deletions(-) (limited to 'dMaggot.html') diff --git a/dMaggot.html b/dMaggot.html index e09b6d4a925..7698a5d5e04 100644 --- a/dMaggot.html +++ b/dMaggot.html @@ -38,77 +38,53 @@ 14
 'status': 'unofficial'}
 
- 15
 * Adding new repository
+            15
$ pmaint sync dMaggot
 
- 16
$ pmaint sync dMaggot
+            16
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 
- 17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
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).
 
- 18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 
- 19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 
- 20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 
- 21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 
- 22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 
- 23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 
- 24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 
- 25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 
- 26
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 
- 27
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 
- 28
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).
+            28
or --ff-only on the command line to override the configured default per
 
- 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
invocation.
 
- 30
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 
- 31
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
Already up to date.
 
- 32
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
*** syncing dMaggot
 
- 33
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** synced dMaggot
 
- 34
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 * Sync succeeded
 
- 35
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
$ git log --format=%ci -1
 
- 36
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ git show -q --pretty=format:%G? HEAD
 
- 37
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dMaggot
 
- 38
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-
- 39
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-
- 40
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-
- 41
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).
-
- 42
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-
- 43
Cloning into '/var/lib/repo-mirror-ci/sync/dMaggot'...
-
- 44
*** syncing dMaggot
-
- 45
*** synced dMaggot
-
- 46
 * Sync succeeded
-
- 47
$ git log --format=%ci -1
-
- 48
$ git show -q --pretty=format:%G? HEAD
-
- 49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dMaggot
-
- 50
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 
-- cgit v1.2.3