diff options
Diffstat (limited to 'interactive-fiction.txt')
| -rw-r--r-- | interactive-fiction.txt | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/interactive-fiction.txt b/interactive-fiction.txt index 94a5fb4a3fb8..80058e48b1d8 100644 --- a/interactive-fiction.txt +++ b/interactive-fiction.txt @@ -7,28 +7,13 @@ 'source': [{'type': 'git', 'uri': 'git://repo.or.cz/gentoo-interactive-fiction.git'}], 'status': 'unofficial'} -$ pmaint sync interactive-fiction -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. - -fatal: read error: Connection reset by peer -*** syncing interactive-fiction -!!! failed syncing interactive-fiction - * Sync failed with 1 - * Will try to re-create + * Adding new repository $ pmaint sync interactive-fiction Cloning into '/var/lib/repo-mirror-ci/sync/interactive-fiction'... -fatal: read error: Connection reset by peer *** syncing interactive-fiction -!!! failed syncing interactive-fiction - * Sync failed again with 1, removing +*** synced interactive-fiction + * Sync succeeded +$ git log --format=%ci -1 +$ git show -q --pretty=format:%G? HEAD +$ pmaint regen --use-local-desc --pkg-desc-index -t 1 interactive-fiction + * Cache regenerated successfully |