From f21335c10ce0d9d6950fe5932b0b233565e02557 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 4 Oct 2020 02:05:10 +0000 Subject: 2020-10-04T02:00:01Z --- vapoursynth.html | 46 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 25 deletions(-) (limited to 'vapoursynth.html') diff --git a/vapoursynth.html b/vapoursynth.html index 93f93630f4b7..4a6bf6c82746 100644 --- a/vapoursynth.html +++ b/vapoursynth.html @@ -30,51 +30,47 @@ 10
$ pmaint sync vapoursynth
- 11
WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

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

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

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

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

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

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

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

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

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

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

-            24
invocation.
+            24
Already up to date.
 

-            25
+            25
*** syncing vapoursynth
 

-            26
Already up to date.
+            26
*** synced vapoursynth
 

-            27
*** syncing vapoursynth
+            27
 * Sync succeeded
 

-            28
*** synced vapoursynth
+            28
$ git log --format=%ci -1
 

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

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

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

-            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 vapoursynth
-

-            33
 * Cache regenerated successfully
+            31
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad