From fb165ed60b092fa26bcc1c9ae52ec2cb8d5b4852 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 9 Apr 2021 23:05:18 +0000 Subject: 2021-04-09T23:00:01Z --- qemu-init.html | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) (limited to 'qemu-init.html') diff --git a/qemu-init.html b/qemu-init.html index bffd303c2743..55200872a120 100644 --- a/qemu-init.html +++ b/qemu-init.html @@ -42,47 +42,51 @@ 16
$ pmaint sync qemu-init
- 17
*** syncing qemu-init
+            17
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', 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
+            18
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', 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
+            19
*** syncing qemu-init
 

-            20
commands sometime before your next pull:
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
commands sometime before your next pull:
 

-            23
  git config pull.rebase true   # rebase
+            23
 

-            24
  git config pull.ff only       # fast-forward only
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
+            25
  git config pull.rebase true   # rebase
 

-            26
You can replace "git config" with "git config --global" to set a default
+            26
  git config pull.ff only       # fast-forward only
 

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
+            27
 

-            28
or --ff-only on the command line to override the configured default per
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
invocation.
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
+            30
or --ff-only on the command line to override the configured default per
 

-            31
Already up to date.
+            31
invocation.
 

-            32
*** synced qemu-init
+            32
 

-            33
 * Sync succeeded
+            33
Already up to date.
 

-            34
$ git log --format=%ci -1
+            34
*** synced qemu-init
 

-            35
$ git show -q --pretty=format:%G? HEAD
+            35
 * Sync succeeded
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 qemu-init
+            36
$ git log --format=%ci -1
 

-            37
 * Cache regenerated successfully
+            37
$ git show -q --pretty=format:%G? HEAD
+

+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 qemu-init
+

+            39
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad