diff options
| author | Brad King <brad.king@kitware.com> | 2010-05-14 13:06:48 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-05-14 13:25:05 -0400 |
| commit | c8c7b22323d8afe9d113a6e1783111057abbeedd (patch) | |
| tree | 3a35abe513974c5fbc1b5bbd3137decdf80fbd68 /CTestCustom.cmake.in | |
| parent | b81727621a10148508d42601229a7da0f23410e6 (diff) | |
| parent | 279b9f22c418656c9a1a24db5d1bc690793fcdc7 (diff) | |
| download | cmake-c8c7b22323d8afe9d113a6e1783111057abbeedd.tar.gz | |
Merge original history into fixed history
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.
Diffstat (limited to 'CTestCustom.cmake.in')
0 files changed, 0 insertions, 0 deletions