diff options
Diffstat (limited to 'calculate.txt')
| -rw-r--r-- | calculate.txt | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/calculate.txt b/calculate.txt index 113cb93f288e..bf62222a3add 100644 --- a/calculate.txt +++ b/calculate.txt @@ -7,26 +7,9 @@ 'uri': 'git://git.calculate-linux.org/calculate/calculate-overlay.git'}], 'status': 'unofficial'} $ pmaint sync calculate -*** syncing calculate -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 git://git.calculate-linux.org/calculate/calculate-overlay - a1b730c72..a679a54b5 develop -> origin/develop -Already up to date. -*** synced calculate - * Sync succeeded -$ git log --format=%ci -1 -$ git show -q --pretty=format:%G? HEAD -$ pmaint regen --use-local-desc --pkg-desc-index -t 32 calculate - * Cache regenerated successfully +pmaint sync: error: argument repo: couldn't find repo 'calculate' (available: gentoo:/usr/portage) + * Sync failed with 2 + * Will try to re-create +$ pmaint sync calculate +pmaint sync: error: argument repo: couldn't find repo 'calculate' (available: gentoo:/usr/portage) + * Sync failed again with 2, removing |