From cdd6acc1edf35556739221c108a8d2786592180c Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 29 Jan 2021 02:34:11 +0000 Subject: 2021-01-29T02:00:01Z --- musl-clang.html | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) (limited to 'musl-clang.html') diff --git a/musl-clang.html b/musl-clang.html index 0b1d575eb02a..9b56087a8cbd 100644 --- a/musl-clang.html +++ b/musl-clang.html @@ -34,49 +34,51 @@ 12
$ pmaint sync musl-clang
- 13
WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
warning: Pulling without specifying how to reconcile divergent branches is
+            14
WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
discouraged. You can squelch this message by running one of the following
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
commands sometime before your next pull:
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
+            17
commands sometime before your next pull:
 

-            18
  git config pull.rebase false  # merge (the default strategy)
+            18
 

-            19
  git config pull.rebase true   # rebase
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
  git config pull.ff only       # fast-forward only
+            20
  git config pull.rebase true   # rebase
 

-            21
+            21
  git config pull.ff only       # fast-forward only
 

-            22
You can replace "git config" with "git config --global" to set a default
+            22
 

-            23
preference for all repositories. You can also pass --rebase, --no-rebase,
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
or --ff-only on the command line to override the configured default per
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
invocation.
+            25
or --ff-only on the command line to override the configured default per
 

-            26
+            26
invocation.
 

-            27
Already up to date.
+            27
 

-            28
*** syncing musl-clang
+            28
Already up to date.
 

-            29
*** synced musl-clang
+            29
*** syncing musl-clang
 

-            30
 * Sync succeeded
+            30
*** synced musl-clang
 

-            31
$ git log --format=%ci -1
+            31
 * Sync succeeded
 

-            32
$ git show -q --pretty=format:%G? HEAD
+            32
$ git log --format=%ci -1
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 musl-clang
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
 * Cache regenerated successfully
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 musl-clang
+

+            35
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad