From d56be1fddfad4da02f57ed271a48d2a334007ba1 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Wed, 30 Dec 2020 05:05:01 +0000 Subject: 2020-12-30T05:00:01Z --- archenroot.html | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'archenroot.html') diff --git a/archenroot.html b/archenroot.html index 80251163d114..8c32308510cc 100644 --- a/archenroot.html +++ b/archenroot.html @@ -38,47 +38,49 @@ 14
$ pmaint sync archenroot
 
- 15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
WARNING:pkgcore:KBrown-pub repo at '/var/lib/repo-mirror-ci/sync/KBrown-pub', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 
- 16
discouraged. You can squelch this message by running one of the following
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 
- 17
commands sometime before your next pull:
+            17
discouraged. You can squelch this message by running one of the following
 
- 18
+            18
commands sometime before your next pull:
 
- 19
  git config pull.rebase false  # merge (the default strategy)
+            19
 
- 20
  git config pull.rebase true   # rebase
+            20
  git config pull.rebase false  # merge (the default strategy)
 
- 21
  git config pull.ff only       # fast-forward only
+            21
  git config pull.rebase true   # rebase
 
- 22
+            22
  git config pull.ff only       # fast-forward only
 
- 23
You can replace "git config" with "git config --global" to set a default
+            23
 
- 24
preference for all repositories. You can also pass --rebase, --no-rebase,
+            24
You can replace "git config" with "git config --global" to set a default
 
- 25
or --ff-only on the command line to override the configured default per
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 
- 26
invocation.
+            26
or --ff-only on the command line to override the configured default per
 
- 27
+            27
invocation.
 
- 28
Already up to date.
+            28
 
- 29
*** syncing archenroot
+            29
Already up to date.
 
- 30
*** synced archenroot
+            30
*** syncing archenroot
 
- 31
 * Sync succeeded
+            31
*** synced archenroot
 
- 32
$ git log --format=%ci -1
+            32
 * Sync succeeded
 
- 33
$ git show -q --pretty=format:%G? HEAD
+            33
$ git log --format=%ci -1
 
- 34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 archenroot
+            34
$ git show -q --pretty=format:%G? HEAD
 
- 35
 * Cache regenerated successfully
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 archenroot
+
+ 36
 * Cache regenerated successfully
 
-- cgit v1.2.3-65-gdbad