2009/4/7 Hannu Koivisto <azure@xxxxxx>: > ---8<---------------------------------------------------- > error: Entry 'kala.c' not uptodate. Cannot merge. > fatal: merging of trees 787519579d90e45dfee00189985fa8c92f56be8f and 83f124d88764604c7d348e73103168bd98665e56 failed > > Could not apply 14eb9c7... Kala addition 2. > ---8<---------------------------------------------------- > > rebase -i used to work fine earlier, but unfortunately I don't > remember which version I used back then (1.6.something). FWIW, I cannot reproduce it. I have quite a bit of changes in my tree though, and maybe that cygwin fstat patches can help... (I believe I posted them, but attached anyway. I didn't try to revert them and retest, sorry)
Attachment:
0001-Add-a-fast-version-of-fstat-to-cygwin-port.patch
Description: Binary data