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
|
{'description': {'en': 'Overlay from Tatsh - emulators/fonts/game/misc'},
'feed': ['https://github.com/Tatsh/tatsh-overlay/commits/master.atom'],
'homepage': 'https://github.com/Tatsh/tatsh-overlay',
'name': 'tatsh-overlay',
'owner': [{'email': 'audvare@gmail.com',
'name': 'Andrew Udvare',
'type': 'person'}],
'quality': 'experimental',
'source': [{'type': 'git',
'uri': 'https://github.com/Tatsh/tatsh-overlay.git'},
{'type': 'git',
'uri': 'git+ssh://git@github.com/Tatsh/tatsh-overlay.git'}],
'status': 'unofficial'}
pkgcore 0.12.24
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tatsh-overlay
*** syncing tatsh-overlay
From https://github.com/Tatsh/tatsh-overlay
+ d68fd8ca...b4b49492 master -> origin/master (forced update)
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.
!!! failed syncing tatsh-overlay
* Sync failed with 1
* Will try to re-create
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tatsh-overlay
*** syncing tatsh-overlay
Cloning into '/var/lib/repo-mirror-ci/sync/tatsh-overlay'...
*** synced tatsh-overlay
* Sync succeeded after re-adding
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 tatsh-overlay
* Cache regenerated successfully
|
GitWeb
