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
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
{'description': {'en': 'Overlay for scientific software and other utilities'},
'feed': ['https://github.com/TheChymera/overlay/commits/master.atom'],
'homepage': 'https://github.com/TheChymera/overlay',
'name': 'chymeric',
'owner': [{'email': 'chr@chymera.eu',
'name': 'Horea Christian',
'type': 'person'}],
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://github.com/TheChymera/overlay.git'},
{'type': 'git', 'uri': 'git://github.com/TheChymera/overlay.git'},
{'type': 'git',
'uri': 'git+ssh://git@github.com/TheChymera/overlay.git'}],
'status': 'unofficial'}
$ pmaint sync chymeric
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://github.com/TheChymera/overlay
aff4737..d30509f master -> origin/master
Updating aff4737..d30509f
Fast-forward
app-office/visidata/ChangeLog | 11 --
app-office/visidata/Manifest | 1 -
app-office/visidata/metadata.xml | 22 ----
app-office/visidata/visidata-1.5.2.ebuild | 60 ----------
sci-libs/simpleitk/ChangeLog | 6 +
sci-libs/simpleitk/Manifest | 2 -
sci-libs/simpleitk/files/0dfae3e_reversed.patch | 120 -------------------
sci-libs/simpleitk/files/77a3d89_reversed.patch | 42 -------
.../simpleitk/files/simpleitk-1.2.4-int-cast.patch | 64 ----------
.../simpleitk/files/simpleitk-1.2.4-module.patch | 22 ----
sci-libs/simpleitk/simpleitk-1.2.4.ebuild | 131 ---------------------
sci-libs/simpleitk/simpleitk-2.0.0.ebuild | 4 +-
12 files changed, 8 insertions(+), 477 deletions(-)
delete mode 100644 app-office/visidata/ChangeLog
delete mode 100644 app-office/visidata/Manifest
delete mode 100644 app-office/visidata/metadata.xml
delete mode 100644 app-office/visidata/visidata-1.5.2.ebuild
delete mode 100644 sci-libs/simpleitk/files/0dfae3e_reversed.patch
delete mode 100644 sci-libs/simpleitk/files/77a3d89_reversed.patch
delete mode 100644 sci-libs/simpleitk/files/simpleitk-1.2.4-int-cast.patch
delete mode 100644 sci-libs/simpleitk/files/simpleitk-1.2.4-module.patch
delete mode 100644 sci-libs/simpleitk/simpleitk-1.2.4.ebuild
*** syncing chymeric
*** synced chymeric
* Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 chymeric
* Cache regenerated successfully
|
GitWeb
