From 36a28c41a44690af636f040114416cef7cc8e943 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 30 Aug 2020 14:36:16 +0000 Subject: 2020-08-30T14:30:01Z --- djc.html | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) (limited to 'djc.html') diff --git a/djc.html b/djc.html index 817f6b2b2fa7..e175e4306c0e 100644 --- a/djc.html +++ b/djc.html @@ -36,47 +36,51 @@ 13
$ pmaint sync djc
- 14
warning: Pulling without specifying how to reconcile divergent branches is
+            14
WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', 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:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

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

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

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

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

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

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

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

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

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

-            27
Already up to date.
+            27
invocation.
 

-            28
*** syncing djc
+            28
 

-            29
*** synced djc
+            29
Already up to date.
 

-            30
 * Sync succeeded
+            30
*** syncing djc
 

-            31
$ git log --format=%ci -1
+            31
*** synced djc
 

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

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 djc
+            33
$ git log --format=%ci -1
 

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

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

+            36
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad