From 127f2341f815bd645041bf37523fd8619c8b1425 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 15 Mar 2021 12:52:37 +0000 Subject: 2021-03-15T12:45:01Z --- anarchy.html | 48 ++++++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 26 deletions(-) (limited to 'anarchy.html') diff --git a/anarchy.html b/anarchy.html index 02f50faffc9e..e19d5fb7504a 100644 --- a/anarchy.html +++ b/anarchy.html @@ -40,53 +40,49 @@ 15
$ pmaint sync anarchy
- 16
WARNING:pkgcore:0bs1d1an repo at '/var/lib/repo-mirror-ci/sync/0bs1d1an', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
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).
 

-            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).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:ag-ops repo at '/var/lib/repo-mirror-ci/sync/ag-ops', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

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

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

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

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

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

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

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

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

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

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

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

-            30
invocation.
+            30
Already up to date.
 

-            31
+            31
*** syncing anarchy
 

-            32
Already up to date.
+            32
*** synced anarchy
 

-            33
*** syncing anarchy
+            33
 * Sync succeeded
 

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

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

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

-            37
$ git show -q --pretty=format:%G? HEAD
-

-            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 anarchy
-

-            39
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad