summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'jjakob.txt')
-rw-r--r--jjakob.txt27
1 files changed, 21 insertions, 6 deletions
diff --git a/jjakob.txt b/jjakob.txt
index f8600f888fbd..905bfaccb1fb 100644
--- a/jjakob.txt
+++ b/jjakob.txt
@@ -16,13 +16,28 @@ pkgcore 0.12.24
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync jjakob
*** syncing jjakob
From https://github.com/jjakob/gentoo-overlay
- bde3c7c..6cd6966 master -> origin/master
-Updating bde3c7c..6cd6966
-Fast-forward
- dev-python/pyocd/files/0004-Fix-test-failure.patch | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ + 6cd6966...9e16851 master -> origin/master (forced update)
+hint: You have divergent branches and need to specify how to reconcile them.
+hint: You can do so by running one of the following commands sometime before
+hint: your next pull:
+hint:
+hint: git config pull.rebase false # merge
+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.
+fatal: Need to specify how to reconcile divergent branches.
+!!! failed syncing jjakob
+ * Sync failed with 1
+ * Will try to re-create
+$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync jjakob
+*** syncing jjakob
+Cloning into '/var/lib/repo-mirror-ci/sync/jjakob'...
*** synced jjakob
- * 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 jjakob