Also be careful about adding/subtracting CR's.
On 5/4/2011 8:32 PM, Sean Kelly wrote:
I modified std.concurrency, added it, committed, then git told me to do a pull
before I pushed my changes. I hadn't updated in a while, and I suspect that the
merge list is everything that had changed since then. In a sense, I suppose it
re-applied all those changes.
Sent from my iPhone
On May 4, 2011, at 5:39 PM, "Jonathan M Davis"<[email protected]> wrote:
Branch: refs/heads/master
Home: https://github.com/D-Programming-Language/phobos
Commit: d0e52a183c6f37f4d6041465c7f68fa00bd48d81
https://github.com/D-Programming-Language/phobos/commit/d0e52a183c6f37f4d6
041465c7f68fa00bd48d81 Author: Sean Kelly<[email protected]>
Date: 2011-05-04 (Wed, 04 May 2011)
Changed paths:
M std/concurrency.d
Log Message:
-----------
receive() now works even if thisTid() has never been called within the main
thread. also applied use of Duration throughout the receiveTimeout code,
since core.sync uses Duration as its native time representation internally
as well.
Commit: 993352d93a263a95bf1feaeae9a1fa9aad94b594
https://github.com/D-Programming-Language/phobos/commit/993352d93a263a95bf
1feaeae9a1fa9aad94b594 Author: Sean Kelly<[email protected]>
Date: 2011-05-04 (Wed, 04 May 2011)
Changed paths:
M changelog.dd
M index.d
M posix.mak
M std/algorithm.d
M std/array.d
M std/bitmanip.d
M std/c/windows/winsock.d
M std/complex.d
M std/container.d
M std/datetime.d
M std/file.d
M std/internal/math/biguintcore.d
M std/intrinsic.d
M std/numeric.d
A std/parallelism.d
M std/range.d
M std/regex.d
M std/stdio.d
M std/stream.d
M std/typecons.d
M std/zip.d
M unittest.d
M win32.mak
Log Message:
-----------
Merge branch 'master' of github.com:D-Programming-Language/phobos
Compare:
https://github.com/D-Programming-Language/phobos/compare/8b2ff4c...993352d
_______________________________________________
phobos mailing list
[email protected]
http://lists.puremagic.com/mailman/listinfo/phobos
I have to wonder what happened with that merge thath so much which was
previously merged into the main repository is listed as having been modified.
For instance, both the recent std.datetime changes and the addition of
std.parallelism are listed as part of that merge when they were already merged
into the main repository. That sort of thing makes me nervous that stuff got
altered when it shouldn't have, though a cursory glance seems to indicate that
you merged in exactly what was already in the main repository in such cases.
I'm guessing that what happened is that you merged the code into _your_
repository, made your changes, and merged them back into the main repository,
and for some reason that merge from the main repository to yours got listed as
changes to the main repository.
I don't know, but it's confusing, and I get concerned when changes that have
already been made are listed as if they were just merged in, implying that
they were just made again.
- Jonathan M Davis
_______________________________________________
phobos mailing list
[email protected]
http://lists.puremagic.com/mailman/listinfo/phobos
_______________________________________________
phobos mailing list
[email protected]
http://lists.puremagic.com/mailman/listinfo/phobos
_______________________________________________
phobos mailing list
[email protected]
http://lists.puremagic.com/mailman/listinfo/phobos
