If you're just on ansible-project list and need more background information
look at this mailing list thread:
https://groups.google.com/forum/#!topic/ansible-devel/mIxqxXRsmCI
= Repomerge on repomerge, check this thread: Update
Following the outline of a plan by willthames and a lot of of manual
merging by jimi-c, the repo merge has been redone and appears to work much
better. PRMover, and merging to ansible/ansible is now happening again.
The update required removing the original repomerge commits and force
pushing the corrected repository to github. We are sorry that this causes
a few inconveniences for users and contributors outlined below.
== How to sync your checkout against the new branch
In most cases, this should be sufficient:
$ git pull --rebase origin devel
But in case you have any problems:
**IMPORTANT** Make sure to do step 1. If you don't make a backup you MAY
LOSE ANY WORK that you've done on the devel branch.
1. Clone your current devel to a new branch, ie. `git checkout devel;
git checkout -b devel_backup`
2. Reset git to a commit prior to the repo merge: `git reset --hard
1a4484be611bdbcaea5f14d1105b7af1ce42552a`
3. Finally, `git pull --rebase` and you should be on the most up to
date devel,
4. cherry-pick any commits you may have had on devel_backup to the new
devel branch.
== Re-migrating PRs
We are extremely sorry but since we had to force push to the repository the
PRs which have already been migrated will have to be migrated again. You
will receive a dedicated comment on the PR with a link to instructions if
your PR falls into this category. We apologize profusely.
== Fixes to PRMover
* PRMover now properly checks that the user has a clone of ansible/ansible
to migrate the PR to. This will give them a more informative error
message to fix the problem.
* PRMover now does a three-way diff which makes some PRs apply cleanly when
they wouldn't apply cleanly with the default merge strategy.
== Why did we have to force push?
The original repomerge script merged the commits from the
ansible-modues-core and ansible-modules-extras repositories by using
read-tree to push the actual state of the modules repositories into the
ansible/ansible repository. The drawback of this was that trying to git
bisect would frequently end up on commits where there was only code from
the modules repository. Without the ansible/ansible code, it was very hard
to test that the commit was valid or not. Rather than subject users trying
to diagnose any bugs via bisect to this problem we decided that we needed
to rewrite git history to get rid of these commits and do the merge a
different way.
Thanks for bearing with us,
Toshio
--
You received this message because you are subscribed to the Google Groups
"Ansible Project" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/ansible-project/3a9c0013-1e45-4c69-8391-b20850a6c485%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
