From e1d76d5e6107970234d54cd9822ed4e5c6b5710b Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 13 Nov 2020 18:05:18 +0000 Subject: 2020-11-13T18:00:01Z --- wayland-desktop.html | 60 ++++++++++++---------------------------------------- 1 file changed, 13 insertions(+), 47 deletions(-) (limited to 'wayland-desktop.html') diff --git a/wayland-desktop.html b/wayland-desktop.html index f295970ebadf..65a5bc014678 100644 --- a/wayland-desktop.html +++ b/wayland-desktop.html @@ -12,7 +12,7 @@ 1
{'description': {'en': 'gentoo overlay for wayland related ebuilds'},
- 2
 'homepage': 'https://github.com/epsilon-0/wayland-desktop',
+            2
 'homepage': 'https://github.com/bsd-ac/wayland-desktop',
 

             3
 'name': 'wayland-desktop',
 

@@ -26,67 +26,33 @@
8
 'source': [{'type': 'git',
- 9
             'uri': 'https://github.com/epsilon-0/wayland-desktop.git'},
+            9
             'uri': 'https://github.com/bsd-ac/wayland-desktop.git'},
 

             10
            {'type': 'git',
 

-            11
             'uri': 'git+ssh://git@github.com/epsilon-0/wayland-desktop.git'}],
+            11
             'uri': 'git+ssh://git@github.com/bsd-ac/wayland-desktop.git'}],
 

             12
 'status': 'unofficial'}
 

-            13
$ pmaint sync wayland-desktop
+            13
 * Resetting, sync parameters changed
 

-            14
warning: Pulling without specifying how to reconcile divergent branches is
+            14
$ pmaint sync wayland-desktop
 

-            15
discouraged. You can squelch this message by running one of the following
+            15
Cloning into '/var/lib/repo-mirror-ci/sync/wayland-desktop'...
 

-            16
commands sometime before your next pull:
+            16
*** syncing wayland-desktop
 

-            17
+            17
*** synced wayland-desktop
 

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

-            19
  git config pull.rebase true   # rebase
+            19
$ git log --format=%ci -1
 

-            20
  git config pull.ff only       # fast-forward only
+            20
$ git show -q --pretty=format:%G? HEAD
 

-            21
+            21
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 wayland-desktop
 

-            22
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
or --ff-only on the command line to override the configured default per
-

-            25
invocation.
-

-            26
-

-            27
From https://github.com/epsilon-0/wayland-desktop
-

-            28
   61e1657..fa07330  master     -> origin/master
-

-            29
Updating 61e1657..fa07330
-

-            30
Fast-forward
-

-            31
 README.md | 21 ++++++++++++++++++++-
-

-            32
 1 file changed, 20 insertions(+), 1 deletion(-)
-

-            33
*** syncing wayland-desktop
-

-            34
*** synced wayland-desktop
-

-            35
 * Sync succeeded
-

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

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

-            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 wayland-desktop
-

-            39
 * Cache regenerated successfully
+            22
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad