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
|
{'description': {'en': 'Ebuilds for packages not in the Gentoo tree\n'
' (lack of maintainer or too experimental) and '
'live ebuilds\n'
' or extensions/bugfixes for packages in the '
'tree'},
'feed': ['https://cgit.gentoo.org/user/mv.git/atom/'],
'homepage': 'https://cgit.gentoo.org/user/mv.git',
'name': 'mv',
'owner': [{'email': 'martin@mvath.de',
'name': 'Martin Väth',
'type': 'person'}],
'quality': 'experimental',
'source': [{'type': 'git',
'uri': 'https://anongit.gentoo.org/git/user/mv.git'},
{'type': 'git', 'uri': 'git://anongit.gentoo.org/user/mv.git'},
{'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/user/mv.git'}],
'status': 'unofficial'}
pkgcore 0.12.17
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync mv
*** syncing mv
From https://anongit.gentoo.org/git/user/mv
+ 1d85349f...05404760 main -> origin/main (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 mv
* Sync failed with 1
* Will try to re-create
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync mv
*** syncing mv
Cloning into '/var/lib/repo-mirror-ci/sync/mv'...
warning: remote HEAD refers to nonexistent ref, unable to checkout
*** synced mv
* Sync succeeded after re-adding
$ git log --format=%ci -1
fatal: your current branch 'master' does not have any commits yet
$ git show -q --pretty=format:%G? HEAD
fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
* Missing profiles/repo_name, removing
|
GitWeb
