From e52cb7b016d5b36e8938657f6c9484cfbc8dc418 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 23 Oct 2020 18:05:16 +0000 Subject: 2020-10-23T18:00:01Z --- xelnor.html | 56 +++++++++++++++++++++----------------------------------- 1 file changed, 21 insertions(+), 35 deletions(-) (limited to 'xelnor.html') diff --git a/xelnor.html b/xelnor.html index 277d4a57f26a..b2df3db33875 100644 --- a/xelnor.html +++ b/xelnor.html @@ -26,61 +26,47 @@ 8
$ pmaint sync xelnor
- 9
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            9
warning: Pulling without specifying how to reconcile divergent branches is
 

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

-            11
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
commands sometime before your next pull:
 

-            12
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
 

-            13
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
  git config pull.rebase false  # merge (the default strategy)
 

-            14
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
  git config pull.rebase true   # rebase
 

-            15
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
  git config pull.ff only       # fast-forward only
 

-            16
warning: Pulling without specifying how to reconcile divergent branches is
+            16
 

-            17
discouraged. You can squelch this message by running one of the following
+            17
You can replace "git config" with "git config --global" to set a default
 

-            18
commands sometime before your next pull:
+            18
preference for all repositories. You can also pass --rebase, --no-rebase,
 

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

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

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

-            22
  git config pull.ff only       # fast-forward only
+            22
Already up to date.
 

-            23
+            23
*** syncing xelnor
 

-            24
You can replace "git config" with "git config --global" to set a default
+            24
*** synced xelnor
 

-            25
preference for all repositories. You can also pass --rebase, --no-rebase,
+            25
 * Sync succeeded
 

-            26
or --ff-only on the command line to override the configured default per
+            26
$ git log --format=%ci -1
 

-            27
invocation.
+            27
$ git show -q --pretty=format:%G? HEAD
 

-            28
+            28
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 xelnor
 

-            29
Already up to date.
-

-            30
*** syncing xelnor
-

-            31
*** synced xelnor
-

-            32
 * Sync succeeded
-

-            33
$ git log --format=%ci -1
-

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

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 xelnor
-

-            36
 * Cache regenerated successfully
+            29
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad