From 111f896d9630bf93ce9800a020203967bcbf2e8d Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Thu, 10 Dec 2020 13:39:48 +0000 Subject: 2020-12-10T13:30:01Z --- youbroketheinternet.html | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) (limited to 'youbroketheinternet.html') diff --git a/youbroketheinternet.html b/youbroketheinternet.html index c24a5a689636..7cec58b30540 100644 --- a/youbroketheinternet.html +++ b/youbroketheinternet.html @@ -58,49 +58,51 @@ 24
$ pmaint sync youbroketheinternet
- 25
warning: Pulling without specifying how to reconcile divergent branches is
+            25
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
discouraged. You can squelch this message by running one of the following
+            26
warning: Pulling without specifying how to reconcile divergent branches is
 

-            27
commands sometime before your next pull:
+            27
discouraged. You can squelch this message by running one of the following
 

-            28
+            28
commands sometime before your next pull:
 

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

-            30
  git config pull.rebase true   # rebase
+            30
  git config pull.rebase false  # merge (the default strategy)
 

-            31
  git config pull.ff only       # fast-forward only
+            31
  git config pull.rebase true   # rebase
 

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

-            33
You can replace "git config" with "git config --global" to set a default
+            33
 

-            34
preference for all repositories. You can also pass --rebase, --no-rebase,
+            34
You can replace "git config" with "git config --global" to set a default
 

-            35
or --ff-only on the command line to override the configured default per
+            35
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            36
invocation.
+            36
or --ff-only on the command line to override the configured default per
 

-            37
+            37
invocation.
 

-            38
warning: redirecting to https://git.gnunet.org/youbroketheinternet-overlay.git/
+            38
 

-            39
Already up to date.
+            39
warning: redirecting to https://git.gnunet.org/youbroketheinternet-overlay.git/
 

-            40
*** syncing youbroketheinternet
+            40
Already up to date.
 

-            41
*** synced youbroketheinternet
+            41
*** syncing youbroketheinternet
 

-            42
 * Sync succeeded
+            42
*** synced youbroketheinternet
 

-            43
$ git log --format=%ci -1
+            43
 * Sync succeeded
 

-            44
$ git show -q --pretty=format:%G? HEAD
+            44
$ git log --format=%ci -1
 

-            45
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 youbroketheinternet
+            45
$ git show -q --pretty=format:%G? HEAD
 

-            46
 * Cache regenerated successfully
+            46
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 youbroketheinternet
+

+            47
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad