Hello,

Several people reported problems with the fact that git history
included the "wipeout-and-revert" pair of commits imported from the
SVN history. The problems seem to be:

1) every file has a pair of two commits (removal/ restore),

2) not every tool shows file history past the removal point.

Since we're still within the "migration weekend" and because this is
relatively easy to fix I think it was worth repairing while we still
can.

I cherry picked all commits that have happened since the migration on
master and branch_5x and re-applied them on top of the commit
immediately preceding the wipeout (for each branch correspondingly).
Then I updated references to master and branch_5x on the repository.
Look at the attached commit tree to see what it looks like for
branch_5x.

Please note that the use of "--force" with "git push" is generally a
big no-no -- this really is a special case and fixup of a problem that
could grow into a larger one.

If you already have a clone of the repo then remote references will be
updated for you on "git fetch". You should then rebase your changes on
top of these new heads. If you don't know how, it's better to create a
new branch and cherry pick commit-by-commit from your old branch.

Apologies for the problem.

Dawid
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org
For additional commands, e-mail: dev-h...@lucene.apache.org

Reply via email to