summaryrefslogtreecommitdiff
blob: 242729afbb6335f69594ee0636f5729c715c648c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
{'description': {'en': "sattvik's overlay with personalized bug fixes and "
                       'tweaks'},
 'feed': ['https://cgit.gentoo.org/user/sattvik.git/atom/'],
 'homepage': 'https://cgit.gentoo.org/user/sattvik.git/',
 'name': 'sattvik',
 'owner': [{'email': 'gentoo@sattvik.com',
            'name': 'Daniel Solano Gomez',
            'type': 'person'}],
 'quality': 'experimental',
 'source': [{'type': 'git',
             'uri': 'https://anongit.gentoo.org/git/user/sattvik.git'},
            {'type': 'git', 'uri': 'git://anongit.gentoo.org/user/sattvik.git'},
            {'type': 'git',
             'uri': 'git+ssh://git@git.gentoo.org/user/sattvik.git'}],
 'status': 'unofficial'}
$ pmaint sync sattvik
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull:

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

You can replace "git config" with "git config --global" to set a default
preference for all repositories. You can also pass --rebase, --no-rebase,
or --ff-only on the command line to override the configured default per
invocation.

From https://anongit.gentoo.org/git/user/sattvik
   4611d5d..e04d4e0  master     -> origin/master
Updating 4611d5d..e04d4e0
Fast-forward
 x11-misc/prismatik/Manifest                        |  6 +--
 x11-misc/prismatik/prismatik-5.11.2.21.ebuild      | 59 ----------------------
 ...5.11.2.22.ebuild => prismatik-5.11.2.25.ebuild} |  0
 3 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100644 x11-misc/prismatik/prismatik-5.11.2.21.ebuild
 rename x11-misc/prismatik/{prismatik-5.11.2.22.ebuild => prismatik-5.11.2.25.ebuild} (100%)
*** syncing sattvik
*** synced sattvik
 * Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sattvik
 * Cache regenerated successfully