Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-convert-hg-source.out @ 5397:11caa374f497
osutil.c: include Python.h before the other headers
This is recommended by the Python documentation, since Python.h defines
some constants.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Sat, 06 Oct 2007 14:14:11 -0300 |
| parents | 11e1e574da02 |
| children |
line wrap: on
line source
merging baz and foo 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved merging foo and baz 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) initializing destination new repository scanning source... sorting... converting... 4 add foo bar 3 change foo 2 make bar and baz copies of foo 1 merge local copy 0 merge remote copy comparing with ../orig searching for changes no changes found