From 999dec99e30a92fa453f6273302d4ffec271f435 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 23 Oct 2020 13:36:13 +0000 Subject: 2020-10-23T13:30:01Z --- torbrowser.html | 54 +++++++++++++++++++++--------------------------------- 1 file changed, 21 insertions(+), 33 deletions(-) (limited to 'torbrowser.html') diff --git a/torbrowser.html b/torbrowser.html index d04141d63027..bc8798873aa5 100644 --- a/torbrowser.html +++ b/torbrowser.html @@ -38,59 +38,47 @@ 14
$ pmaint sync torbrowser
- 15
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).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            18
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).
+            18
 

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

-            20
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).
+            20
  git config pull.rebase true   # rebase
 

-            21
warning: Pulling without specifying how to reconcile divergent branches is
+            21
  git config pull.ff only       # fast-forward only
 

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

-            23
commands sometime before your next pull:
+            23
You can replace "git config" with "git config --global" to set a default
 

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

-            25
  git config pull.rebase false  # merge (the default strategy)
+            25
or --ff-only on the command line to override the configured default per
 

-            26
  git config pull.rebase true   # rebase
+            26
invocation.
 

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

-            28
+            28
Already up to date.
 

-            29
You can replace "git config" with "git config --global" to set a default
+            29
*** syncing torbrowser
 

-            30
preference for all repositories. You can also pass --rebase, --no-rebase,
+            30
*** synced torbrowser
 

-            31
or --ff-only on the command line to override the configured default per
+            31
 * Sync succeeded
 

-            32
invocation.
+            32
$ git log --format=%ci -1
 

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

-            34
Already up to date.
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 torbrowser
 

-            35
*** syncing torbrowser
-

-            36
*** synced torbrowser
-

-            37
 * Sync succeeded
-

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

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

-            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 torbrowser
-

-            41
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad