diff options
Diffstat (limited to 'flussence.txt')
| -rw-r--r-- | flussence.txt | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/flussence.txt b/flussence.txt index 19a9dd933be0..8646a300199a 100644 --- a/flussence.txt +++ b/flussence.txt @@ -12,12 +12,18 @@ 'uri': 'ssh://git@repo.or.cz/flussence-overlay.git'}], 'status': 'unofficial'} $ pmaint sync flussence -WARNING:pkgcore:concaveoverlay repo at '/var/lib/repo-mirror-ci/sync/concaveoverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:eigenlay repo at '/var/lib/repo-mirror-ci/sync/eigenlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -Already up to date. +From https://repo.or.cz/flussence-overlay + + d7ef7bb...0517f7f master -> origin/master (forced update) +fatal: refusing to merge unrelated histories +*** syncing flussence +!!! failed syncing flussence + * Sync failed with 1 + * Will try to re-create +$ pmaint sync flussence +Cloning into '/var/lib/repo-mirror-ci/sync/flussence'... *** syncing flussence *** synced flussence - * Sync succeeded + * Sync succeeded after re-adding $ git log --format=%ci -1 $ git show -q --pretty=format:%G? HEAD $ pmaint regen --use-local-desc --pkg-desc-index -t 1 flussence |