From dda7b590877b5194f6eb424cf22651903a36f53e Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 13 Sep 2020 10:35:10 +0000 Subject: 2020-09-13T10:30:01Z --- java.html | 46 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 25 deletions(-) (limited to 'java.html') diff --git a/java.html b/java.html index 8c53017a8129..4a0ce8432a40 100644 --- a/java.html +++ b/java.html @@ -40,51 +40,47 @@ 15
$ pmaint sync java
- 16
WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

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

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

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

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

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

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

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

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

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

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

-            29
invocation.
+            29
Already up to date.
 

-            30
+            30
*** syncing java
 

-            31
Already up to date.
+            31
*** synced java
 

-            32
*** syncing java
+            32
 * Sync succeeded
 

-            33
*** synced java
+            33
$ git log --format=%ci -1
 

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

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

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

-            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 java
-

-            38
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad