diff options
Diffstat (limited to 'flussence.txt')
| -rw-r--r-- | flussence.txt | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/flussence.txt b/flussence.txt index 5bc40f24a2bd..98dc8593e6e7 100644 --- a/flussence.txt +++ b/flussence.txt @@ -12,8 +12,6 @@ 'uri': 'ssh://git@repo.or.cz/flussence-overlay.git'}], 'status': 'unofficial'} $ pmaint sync flussence -WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). 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: @@ -27,25 +25,10 @@ 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. -There is no tracking information for the current branch. -Please specify which branch you want to merge with. -See git-pull(1) for details. - - git pull <remote> <branch> - -If you wish to set tracking information for this branch you can do so with: - - git branch --set-upstream-to=origin/<branch> master - -*** 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'... +Already up to date. *** syncing flussence *** synced flussence - * Sync succeeded after re-adding + * Sync succeeded $ git log --format=%ci -1 $ git show -q --pretty=format:%G? HEAD $ pmaint regen --use-local-desc --pkg-desc-index -t 1 flussence |