From b7e10702f43d182d67deb0a911b63b204439a48f Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 16 Nov 2020 09:05:20 +0000 Subject: 2020-11-16T09:00:01Z --- brother-overlay.html | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) (limited to 'brother-overlay.html') diff --git a/brother-overlay.html b/brother-overlay.html index 42c848431252..fc86a5bdedbb 100644 --- a/brother-overlay.html +++ b/brother-overlay.html @@ -42,47 +42,51 @@ 16
$ pmaint sync brother-overlay
- 17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
WARNING:pkgcore:atom repo at '/var/lib/repo-mirror-ci/sync/atom', 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
+            18
WARNING:pkgcore:atom repo at '/var/lib/repo-mirror-ci/sync/atom', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

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

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

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

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

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

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

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

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

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

-            30
Already up to date.
+            30
invocation.
 

-            31
*** syncing brother-overlay
+            31
 

-            32
*** synced brother-overlay
+            32
Already up to date.
 

-            33
 * Sync succeeded
+            33
*** syncing brother-overlay
 

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

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

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 brother-overlay
+            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 1 brother-overlay
+

+            39
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad