Merge original history into fixed history

Browse Source

Commit f90bdaf3 ("BUG #10209: Fixed FindwxWidget CXX flags parsing
error.", 2010-05-09) was accidentally based on a "nightly start time"
merge branch and then rebased on commit e30279e7 ("KWSys Nightly Date
Stamp", 2010-05-10) by "hg-git".  The rebase brought the whole nightly
merge branch along as empty commits, but the committer times were not
updated during the rebase.

The above led to a series of commit objects whose recorded committer
time predates their parent commits.  This confuses Git's date-based
revision selection (like --since="$date") which assumes that commit
object times are always newer than their parents.

We resolved the problem by rebasing history since f90bdaf3 onto
e30279e7.  This merge commit combines the two versions of history to
allow branches to fast-forward through here from the original history.
The first parent of this commit is the fixed history and the second
parent is the original history.  Now date-based revision selection works
correctly because it can walk through the left of this merge.

...

This commit is contained in:

Brad King 2010-05-14 13:06:48 -04:00

parent b81727621a 279b9f22c4

commit c8c7b22323

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available