From bcc4b19a6bc7e3c6d0d6d6ecd161e2977a8183a3 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Thu, 26 Nov 2020 08:35:40 +0000 Subject: 2020-11-26T08:30:01Z --- pross.html | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'pross.html') diff --git a/pross.html b/pross.html index 71b885d103b3..6bb769e808b5 100644 --- a/pross.html +++ b/pross.html @@ -34,51 +34,49 @@ 12
$ pmaint sync pross
 
- 13
WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 
- 14
warning: Pulling without specifying how to reconcile divergent branches is
+            14
discouraged. You can squelch this message by running one of the following
 
- 15
discouraged. You can squelch this message by running one of the following
+            15
commands sometime before your next pull:
 
- 16
commands sometime before your next pull:
+            16
 
- 17
+            17
  git config pull.rebase false  # merge (the default strategy)
 
- 18
  git config pull.rebase false  # merge (the default strategy)
+            18
  git config pull.rebase true   # rebase
 
- 19
  git config pull.rebase true   # rebase
+            19
  git config pull.ff only       # fast-forward only
 
- 20
  git config pull.ff only       # fast-forward only
+            20
 
- 21
+            21
You can replace "git config" with "git config --global" to set a default
 
- 22
You can replace "git config" with "git config --global" to set a default
+            22
preference for all repositories. You can also pass --rebase, --no-rebase,
 
- 23
preference for all repositories. You can also pass --rebase, --no-rebase,
+            23
or --ff-only on the command line to override the configured default per
 
- 24
or --ff-only on the command line to override the configured default per
+            24
invocation.
 
- 25
invocation.
+            25
 
- 26
+            26
Already up to date.
 
- 27
Already up to date.
+            27
*** syncing pross
 
- 28
*** syncing pross
+            28
*** synced pross
 
- 29
*** synced pross
+            29
 * Sync succeeded
 
- 30
 * Sync succeeded
+            30
$ git log --format=%ci -1
 
- 31
$ git log --format=%ci -1
+            31
$ git show -q --pretty=format:%G? HEAD
 
- 32
$ git show -q --pretty=format:%G? HEAD
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pross
 
- 33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pross
-
- 34
 * gnome-base/gnome-control-center-3.36.4-r1: failed sourcing ebuild: inherit requires unknown eclass: gnome3.eclass
+            33
 * gnome-base/gnome-control-center-3.36.4-r1: failed sourcing ebuild: inherit requires unknown eclass: gnome3.eclass
 
[FATAL] - 35
 * Cache regen failed with 1
+            34
 * Cache regen failed with 1
 
-- cgit v1.2.3-65-gdbad