summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'buzden.txt')
-rw-r--r--buzden.txt42
1 files changed, 33 insertions, 9 deletions
diff --git a/buzden.txt b/buzden.txt
index a106673e87e9..ce42866b4666 100644
--- a/buzden.txt
+++ b/buzden.txt
@@ -15,16 +15,40 @@ pkgcore 0.12.8
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync buzden
*** syncing buzden
From https://github.com/buzden/buzden-overlay
- 75dad08..c80ffec master -> origin/master
-Updating 75dad08..c80ffec
-Fast-forward
- .../sphinxcontrib-inlinesyntaxhighlight/Manifest | 2 ++
- .../sphinxcontrib-inlinesyntaxhighlight-0.2.ebuild | 28 ++++++++++++++++++++++
- 2 files changed, 30 insertions(+)
- create mode 100644 dev-python/sphinxcontrib-inlinesyntaxhighlight/Manifest
- create mode 100644 dev-python/sphinxcontrib-inlinesyntaxhighlight/sphinxcontrib-inlinesyntaxhighlight-0.2.ebuild
+ + c80ffec...fb1c3f6 master -> origin/master (forced update)
+hint: Pulling without specifying how to reconcile divergent branches is
+hint: discouraged. You can squelch this message by running one of the following
+hint: commands sometime before your next pull:
+hint:
+hint: git config pull.rebase false # merge (the default strategy)
+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.
+Committer identity unknown
+
+*** Please tell me who you are.
+
+Run
+
+ git config --global user.email "you@example.com"
+ git config --global user.name "Your Name"
+
+to set your account's default identity.
+Omit --global to set the identity only in this repository.
+
+fatal: empty ident name (for <repomirrorci@jacamar.gentoo.org>) not allowed
+!!! failed syncing buzden
+ * Sync failed with 1
+ * Will try to re-create
+$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync buzden
+*** syncing buzden
+Cloning into '/var/lib/repo-mirror-ci/sync/buzden'...
*** synced buzden
- * Sync succeeded
+ * Sync succeeded after re-adding
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 buzden