From 2431efbc5bcf8e8c1e445e1ba82bcd719dc89a2b Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 29 Jan 2021 09:34:25 +0000 Subject: 2021-01-29T09:00:01Z --- nix-guix.html | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'nix-guix.html') diff --git a/nix-guix.html b/nix-guix.html index a88716295e14..6d8dab6b274c 100644 --- a/nix-guix.html +++ b/nix-guix.html @@ -34,51 +34,49 @@ 12
$ pmaint sync nix-guix
- 13
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).
+            13
WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            17
commands sometime before your next pull:
+            17
 

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

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

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

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

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

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

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

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

-            26
invocation.
+            26
 

-            27
+            27
Already up to date.
 

-            28
Already up to date.
+            28
*** syncing nix-guix
 

-            29
*** syncing nix-guix
+            29
*** synced nix-guix
 

-            30
*** synced nix-guix
+            30
 * Sync succeeded
 

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

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

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

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 nix-guix
-

-            35
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad