Quoting Stanislav Ochotnicky (2013-07-30 11:26:09)
Heya all,
as has happened before...it's happened again :-/ fedora-review repo (devel
branch) has become a mess due to recent cross-merging.
We can either let it be or fix it by resetting devel branch to commit b80cd0
(NEWS: update from Alec) and then rebasing issue-212 on top of that + add latest
commit from Alec. Amount of work is quite minimal, but this would of course
break all clones out there + Jenkins would have to be reset (this is a minor
issue though).
I *really* hate to reset things and break peoples' clones, but current history
is confusing as hell. If you feel strongly one way or the other, reply. I'll
wait a few days before reset.
I have reset the repository to earlier time, reapplied last commit from Alec on
top and then rebased and re-merged issue-212 on devel. I have done few test
reviews and things should work, but I would like to make sure so:
* Alec please check your commit is OK
* Josef check my rebase was correct and it included all of your commits in
issue-212, if not I will go back and retrieve them from my backups
--
Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Software Engineer - Developer Experience
PGP: 7B087241
Red Hat Inc.
http://cz.redhat.com