Fix up mangled core.bitop names for new attributes. #1040

Merged
merged 3 commits into from Jul 15, 2012

Conversation

Projects
None yet
6 participants
@alexrp
Member

alexrp commented Jul 9, 2012

Should be merged with: D-Programming-Language/druntime#266

Also killed some old intrinsics from DMD2 that no longer exist while I was there.

- "9intrinsic4outpFNbkhZh",
- "9intrinsic5bswapFNaNbkZk",
- "9intrinsic5outplFNbkkZk",
- "9intrinsic5outpwFNbktZt",
#endif

This comment has been minimized.

Show comment Hide comment
@MartinNowak

MartinNowak Jul 10, 2012

Member

Please leave the D1 code.
It makes it simpler for @WalterBright to maintain the trees.

@MartinNowak

MartinNowak Jul 10, 2012

Member

Please leave the D1 code.
It makes it simpler for @WalterBright to maintain the trees.

This comment has been minimized.

Show comment Hide comment
@alexrp

alexrp Jul 10, 2012

Member

This isn't D1 code, it's under DMDV2. It was there because it wasn't removed when the std.intrinsic module was removed a while back.

@alexrp

alexrp Jul 10, 2012

Member

This isn't D1 code, it's under DMDV2. It was there because it wasn't removed when the std.intrinsic module was removed a while back.

src/toir.c
+ "5bitop4outpFNaNbkhZh",
+ "5bitop5bswapFNaNbNfkZk",
+ "5bitop5outplFNaNbkkZk",
+ "5bitop5outpwFNaNbktZt",
};

This comment has been minimized.

Show comment Hide comment
@MartinNowak

MartinNowak Jul 10, 2012

Member

inp and outp are marked pure (the Na part)

@MartinNowak

MartinNowak Jul 10, 2012

Member

inp and outp are marked pure (the Na part)

This comment has been minimized.

Show comment Hide comment
@alexrp

alexrp Jul 10, 2012

Member

Ah, I forgot to fix this.

@alexrp

alexrp Jul 10, 2012

Member

Ah, I forgot to fix this.

This comment has been minimized.

Show comment Hide comment
@alexrp

alexrp Jul 10, 2012

Member

Fixed.

@alexrp

alexrp Jul 10, 2012

Member

Fixed.

WalterBright added a commit that referenced this pull request Jul 15, 2012

Merge pull request #1040 from alexrp/intrinsics
Fix up mangled core.bitop names for new attributes.

@WalterBright WalterBright merged commit c669305 into dlang:master Jul 15, 2012

@WalterBright

This comment has been minimized.

Show comment Hide comment
@WalterBright

WalterBright Jul 15, 2012

Member

Doesn't work, doesn't line up with the changes to bitops.d:

unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop3bsrFNaNbkZi
unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop5bswapFNaNbkZk
unittest3.obj(unittest3)
Error 42: Symbol Undefined _D4core5bitop3bsfFNaNbkZi
unittest3.obj(unittest3)
Error 42: Symbol Undefined _D4core5bitop2btFNaNbxPkkZi
unittest3.obj(unittest3)
Error 42: Symbol Undefined _D4core5bitop3btsFNbPkkZi
unittest3.obj(unittest3)
Error 42: Symbol Undefined _D4core5bitop3btrFNbPkkZi
--- errorlevel 6

Member

WalterBright commented Jul 15, 2012

Doesn't work, doesn't line up with the changes to bitops.d:

unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop3bsrFNaNbkZi
unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop5bswapFNaNbkZk
unittest3.obj(unittest3)
Error 42: Symbol Undefined _D4core5bitop3bsfFNaNbkZi
unittest3.obj(unittest3)
Error 42: Symbol Undefined _D4core5bitop2btFNaNbxPkkZi
unittest3.obj(unittest3)
Error 42: Symbol Undefined _D4core5bitop3btsFNbPkkZi
unittest3.obj(unittest3)
Error 42: Symbol Undefined _D4core5bitop3btrFNbPkkZi
--- errorlevel 6

@9rnsr

This comment has been minimized.

Show comment Hide comment
@9rnsr

9rnsr Jul 15, 2012

Member

Fixed by merging this pull request.
D-Programming-Language#1050

Member

9rnsr commented Jul 15, 2012

Fixed by merging this pull request.
D-Programming-Language#1050

@WalterBright

This comment has been minimized.

Show comment Hide comment
@WalterBright

WalterBright Jul 15, 2012

Member

reverted

Member

WalterBright commented Jul 15, 2012

reverted

@WalterBright

This comment has been minimized.

Show comment Hide comment
@WalterBright

WalterBright Jul 15, 2012

Member

ack, too late!

Member

WalterBright commented Jul 15, 2012

ack, too late!

@9rnsr

This comment has been minimized.

Show comment Hide comment
@9rnsr

9rnsr Jul 15, 2012

Member

My pull was definitely fixed the breaking. (Pull-tester result).
Please select:

  1. revert your reverting
  2. revert mine and @alexrp changes.
Member

9rnsr commented Jul 15, 2012

My pull was definitely fixed the breaking. (Pull-tester result).
Please select:

  1. revert your reverting
  2. revert mine and @alexrp changes.
@9rnsr

This comment has been minimized.

Show comment Hide comment
@9rnsr

9rnsr Jul 15, 2012

Member

I'm starting to revert your reverting, @WalterBright .
Please wait a while.

Member

9rnsr commented Jul 15, 2012

I'm starting to revert your reverting, @WalterBright .
Please wait a while.

@9rnsr

This comment has been minimized.

Show comment Hide comment
@9rnsr

9rnsr Jul 15, 2012

Member

Finished. (commit) Git head will become all green.

Member

9rnsr commented Jul 15, 2012

Finished. (commit) Git head will become all green.

@WalterBright

This comment has been minimized.

Show comment Hide comment
@WalterBright

WalterBright Jul 15, 2012

Member

Pulled your commits, and am now getting:

unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop3bsrFNaNbNfkZi
unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop3btcFNaNbNfPkkZi
unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop3btrFNaNbNfPkkZi
unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop3btsFNaNbNfPkkZi
unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop2btFNaNbNfxPkkZi
unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop3bsfFNaNbNfkZi

Member

WalterBright commented Jul 15, 2012

Pulled your commits, and am now getting:

unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop3bsrFNaNbNfkZi
unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop3btcFNaNbNfPkkZi
unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop3btrFNaNbNfPkkZi
unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop3btsFNaNbNfPkkZi
unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop2btFNaNbNfxPkkZi
unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop3bsfFNaNbNfkZi

@9rnsr

This comment has been minimized.

Show comment Hide comment
@9rnsr

9rnsr Jul 15, 2012

Member

What test do you see? Now auto-tester is almost green. And in my PC (Windows 7 64bit), Phobos test succeeds correctly.

Member

9rnsr commented Jul 15, 2012

What test do you see? Now auto-tester is almost green. And in my PC (Windows 7 64bit), Phobos test succeeds correctly.

@WalterBright

This comment has been minimized.

Show comment Hide comment
@WalterBright

WalterBright Jul 15, 2012

Member

make unittest

in the phobos directory.

Member

WalterBright commented Jul 15, 2012

make unittest

in the phobos directory.

@WalterBright

This comment has been minimized.

Show comment Hide comment
@WalterBright

WalterBright Jul 15, 2012

Member

Fails on OSX:

Testing generated/osx/debug/32/unittest/std/algorithm
Undefined symbols for architecture i386:
"_D4core5bitop3bsrFNaNbkZi", referenced from:
_D3std5array17__T8AppenderTAyaZ8Appender11newCapacityFkZk in algorithm.o
_D3std5array16__T8AppenderTAaZ8Appender11newCapacityFkZk in algorithm.o
_D3std5array17__T8AppenderTAxaZ8Appender11newCapacityFkZk in algorithm.o
_D3std5array18__T8AppenderTAAyaZ8Appender11newCapacityFkZk in algorithm.o
_D3std5array18__T8AppenderTAAyuZ8Appender11newCapacityFkZk in algorithm.o
_D3std5array16__T8AppenderTAuZ8Appender11newCapacityFkZk in algorithm.o
_D3std5array17__T8AppenderTAxuZ8Append--- errorlevel 1
er11newCapacityFkZk in algorithm.o
...
"_D4core5bitop5bswapFNaNbkZk", referenced from:
_D3std8bitmanip14swapEndianImplFNaNbNekZk in libphobos2.a(bitmanip_39d_59c.o)
_D3std8bitmanip14swapEndianImplFNaNbNemZm in libphobos2.a(bitmanip_39e_59c.o)
"_D4core5bitop3bsfFNaNbkZi", referenced from:
_D3std7numeric3Fft6__ctorMFAfZC3std7numeric3Fft in libphobos2.a(numeric_d2c_120.o)
_D3std7numeric14__T6StrideTAfZ6Stride6nStepsMFNdkZk in libphobos2.a(numeric_d31_5ab.o)
_D3std7numeric12isPowerOfTwoFkZb in libphobos2.a(numeric_d2d_4d8.o)

Member

WalterBright commented Jul 15, 2012

Fails on OSX:

Testing generated/osx/debug/32/unittest/std/algorithm
Undefined symbols for architecture i386:
"_D4core5bitop3bsrFNaNbkZi", referenced from:
_D3std5array17__T8AppenderTAyaZ8Appender11newCapacityFkZk in algorithm.o
_D3std5array16__T8AppenderTAaZ8Appender11newCapacityFkZk in algorithm.o
_D3std5array17__T8AppenderTAxaZ8Appender11newCapacityFkZk in algorithm.o
_D3std5array18__T8AppenderTAAyaZ8Appender11newCapacityFkZk in algorithm.o
_D3std5array18__T8AppenderTAAyuZ8Appender11newCapacityFkZk in algorithm.o
_D3std5array16__T8AppenderTAuZ8Appender11newCapacityFkZk in algorithm.o
_D3std5array17__T8AppenderTAxuZ8Append--- errorlevel 1
er11newCapacityFkZk in algorithm.o
...
"_D4core5bitop5bswapFNaNbkZk", referenced from:
_D3std8bitmanip14swapEndianImplFNaNbNekZk in libphobos2.a(bitmanip_39d_59c.o)
_D3std8bitmanip14swapEndianImplFNaNbNemZm in libphobos2.a(bitmanip_39e_59c.o)
"_D4core5bitop3bsfFNaNbkZi", referenced from:
_D3std7numeric3Fft6__ctorMFAfZC3std7numeric3Fft in libphobos2.a(numeric_d2c_120.o)
_D3std7numeric14__T6StrideTAfZ6Stride6nStepsMFNdkZk in libphobos2.a(numeric_d31_5ab.o)
_D3std7numeric12isPowerOfTwoFkZb in libphobos2.a(numeric_d2d_4d8.o)

@WalterBright

This comment has been minimized.

Show comment Hide comment
@WalterBright

WalterBright Jul 15, 2012

Member

dmd also fails to run when built with debug, as the array sizes in toir.c are mismatched.

Member

WalterBright commented Jul 15, 2012

dmd also fails to run when built with debug, as the array sizes in toir.c are mismatched.

@alexrp

This comment has been minimized.

Show comment Hide comment
@alexrp

alexrp Jul 15, 2012

Member

This is really odd. The auto tester is completely green: http://d.puremagic.com/test-results/

I also can't reproduce the problem on my Linux box. Trying to set up a build environment on my OS X machine to investigate...

Member

alexrp commented Jul 15, 2012

This is really odd. The auto tester is completely green: http://d.puremagic.com/test-results/

I also can't reproduce the problem on my Linux box. Trying to set up a build environment on my OS X machine to investigate...

@alexrp

This comment has been minimized.

Show comment Hide comment
@alexrp

alexrp Jul 15, 2012

Member

@WalterBright I just successfully built and tested the entire DMD toolchain on OS X (both in 32-bit and 64-bit mode). I really can't seem to reproduce these issues... Can you give me specific instructions on how to repro?

Member

alexrp commented Jul 15, 2012

@WalterBright I just successfully built and tested the entire DMD toolchain on OS X (both in 32-bit and 64-bit mode). I really can't seem to reproduce these issues... Can you give me specific instructions on how to repro?

@WalterBright

This comment has been minimized.

Show comment Hide comment
@WalterBright

WalterBright Jul 15, 2012

Member

I suspect it may have something to do with Kenji's "revert" action a few messages back. Has something branched, and I don't have the latest branch?

Member

WalterBright commented Jul 15, 2012

I suspect it may have something to do with Kenji's "revert" action a few messages back. Has something branched, and I don't have the latest branch?

@WalterBright

This comment has been minimized.

Show comment Hide comment
@WalterBright

WalterBright Jul 15, 2012

Member

How about you email me your versions of:

toir.c
builtin.c
std/core/bitop.d

?

Member

WalterBright commented Jul 15, 2012

How about you email me your versions of:

toir.c
builtin.c
std/core/bitop.d

?

@alexrp

This comment has been minimized.

Show comment Hide comment
@alexrp

alexrp Jul 15, 2012

Member

First, see: D-Programming-Language#1051

This definitely fixes an issue in my original pull request(s).

As for those files, I did the testing straight from Git HEAD of the DPL repositories, so:

Maybe try asking git status if your local master has diverged or something?

Member

alexrp commented Jul 15, 2012

First, see: D-Programming-Language#1051

This definitely fixes an issue in my original pull request(s).

As for those files, I did the testing straight from Git HEAD of the DPL repositories, so:

Maybe try asking git status if your local master has diverged or something?

@9rnsr

This comment has been minimized.

Show comment Hide comment
@9rnsr

9rnsr Jul 16, 2012

Member

I had not used debug-build in every day, so I cannot notice the problem.

@WalterBright:
You can test Alex's pul #1051 on your dmd master:

  #move on git HEAD
  git checkout master

  #create and checkout temporary branch for test
  git checkout -b Alex_bitop-fixes

  #merge #1051 changes from Alex's repository in your current branch (== Alex_bitop-fixes) directly
  git pull https://github.com/alexrp/dmd bitop-fixups

This matter is stealing Walter's time, and it's my large mistake.
After Walter's try, if #1051 couldn't resolve problems, I revert all of changes.

Member

9rnsr commented Jul 16, 2012

I had not used debug-build in every day, so I cannot notice the problem.

@WalterBright:
You can test Alex's pul #1051 on your dmd master:

  #move on git HEAD
  git checkout master

  #create and checkout temporary branch for test
  git checkout -b Alex_bitop-fixes

  #merge #1051 changes from Alex's repository in your current branch (== Alex_bitop-fixes) directly
  git pull https://github.com/alexrp/dmd bitop-fixups

This matter is stealing Walter's time, and it's my large mistake.
After Walter's try, if #1051 couldn't resolve problems, I revert all of changes.

@WalterBright

This comment has been minimized.

Show comment Hide comment
@WalterBright

WalterBright Jul 16, 2012

Member

I tried repulling the files. Same problem. That's why I asked you to email which files you are using. I will test them, if they work, I will push them to github. If not, I will revert to the ones that do work.

Member

WalterBright commented Jul 16, 2012

I tried repulling the files. Same problem. That's why I asked you to email which files you are using. I will test them, if they work, I will push them to github. If not, I will revert to the ones that do work.

@9rnsr

This comment has been minimized.

Show comment Hide comment
@9rnsr

9rnsr Jul 16, 2012

Member

I tried repulling the files. Same problem. That's why I asked you to email which files you are using. I will test them, if they work, I will push them to github. If not, I will revert to the ones that do work.

I understand. I'll wait your commit or reverting.

Sorry for my work that have complicated the situation. I got a bitter experience:
”If there is a broken head, reverting commits that breaks it is the only way we can do."
That is my mistake.

Member

9rnsr commented Jul 16, 2012

I tried repulling the files. Same problem. That's why I asked you to email which files you are using. I will test them, if they work, I will push them to github. If not, I will revert to the ones that do work.

I understand. I'll wait your commit or reverting.

Sorry for my work that have complicated the situation. I got a bitter experience:
”If there is a broken head, reverting commits that breaks it is the only way we can do."
That is my mistake.

@alexrp

This comment has been minimized.

Show comment Hide comment
@alexrp

alexrp Jul 16, 2012

Member

Did #1051 solve the problem for you? It should at least fix one ICE that @jmdavis reported on the druntime mailing list.

Member

alexrp commented Jul 16, 2012

Did #1051 solve the problem for you? It should at least fix one ICE that @jmdavis reported on the druntime mailing list.

@klickverbot

This comment has been minimized.

Show comment Hide comment
@klickverbot

klickverbot Jul 16, 2012

Member

»repulling the files« – just try building DMD, druntime and Phobos from a fresh checkout? Everything builds fine on OS X with latest master here.

Member

klickverbot commented Jul 16, 2012

»repulling the files« – just try building DMD, druntime and Phobos from a fresh checkout? Everything builds fine on OS X with latest master here.

@9rnsr

This comment has been minimized.

Show comment Hide comment
@9rnsr

9rnsr Jul 16, 2012

Member

@klickverbot:
Current lastest master has a problem with debug build. It's reported by @jmdavis in newsgroup, and @alexrp has been posted the pull #1051 to fix the problem.
I have already verified that the #1051 fixes the reported ICE problem in my Windows PC, but, it's yet not confirmed whether the undefined symbols problems reported by Walter is really fixed with #1051.
If #1051 will fix his problem, it will be merged. Otherwise all of changes will be reverted.

Member

9rnsr commented Jul 16, 2012

@klickverbot:
Current lastest master has a problem with debug build. It's reported by @jmdavis in newsgroup, and @alexrp has been posted the pull #1051 to fix the problem.
I have already verified that the #1051 fixes the reported ICE problem in my Windows PC, but, it's yet not confirmed whether the undefined symbols problems reported by Walter is really fixed with #1051.
If #1051 will fix his problem, it will be merged. Otherwise all of changes will be reverted.

@klickverbot

This comment has been minimized.

Show comment Hide comment
@klickverbot

klickverbot Jul 16, 2012

Member

@9rnsr: Sorry, master was not entirely accurate, I already applied #1051. I sincerely hope the changes won't just reverted, as it doesn't seem likely that e.g. _D3std5array17T8AppenderTAyaZ8Appender11newCapacityFkZk being reported as missing is a consequence of this pull request. Rather, it seems like Walter's build environment is broken (stale files, …).

Member

klickverbot commented Jul 16, 2012

@9rnsr: Sorry, master was not entirely accurate, I already applied #1051. I sincerely hope the changes won't just reverted, as it doesn't seem likely that e.g. _D3std5array17T8AppenderTAyaZ8Appender11newCapacityFkZk being reported as missing is a consequence of this pull request. Rather, it seems like Walter's build environment is broken (stale files, …).

@9rnsr

This comment has been minimized.

Show comment Hide comment
@9rnsr

9rnsr Jul 16, 2012

Member

Rather, it seems like Walter's build environment is broken (stale files, …).
Maybe. But, there may be other real problems.

I've learned a serious experience by this matter: if merging a pull request causes the auto-tester breaking, we should revert it as far as possible, rather than adding more fixture commits. And it is that Walter was always doing.

Member

9rnsr commented Jul 16, 2012

Rather, it seems like Walter's build environment is broken (stale files, …).
Maybe. But, there may be other real problems.

I've learned a serious experience by this matter: if merging a pull request causes the auto-tester breaking, we should revert it as far as possible, rather than adding more fixture commits. And it is that Walter was always doing.

@klickverbot

This comment has been minimized.

Show comment Hide comment
@klickverbot

klickverbot Jul 16, 2012

Member

Last time I checked, the auto tester was all green (because it runs a release build of DMD, but still).

Member

klickverbot commented Jul 16, 2012

Last time I checked, the auto tester was all green (because it runs a release build of DMD, but still).

@WalterBright

This comment has been minimized.

Show comment Hide comment
@WalterBright

WalterBright Jul 16, 2012

Member

On Windows:

unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop3bsrFNaNbNfkZi
unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop3btcFNaNbNfPkkZi
unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop3btrFNaNbNfPkkZi
unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop3btsFNaNbNfPkkZi
unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop2btFNaNbNfxPkkZi
unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop3bsfFNaNbNfkZi

On OSX:

Testing generated/osx/debug/32/unittest/crc32
Undefined symbols for architecture i386:
"_D4core5bitop3btrFNaNbNfPkkZi", referenced from:
_D2gc3gcx3Gcx11fullcollectMFZk in libphobos2.a(gcx_2ed_122.o)
"_D4core5bitop3bsfFNaNbNfkZi", referenced from:
_D2gc3gcx3Gcx11fullcollectMFZk in libphobos2.a(gcx_2ed_122.o)
"_D4core5bitop3btsFNaNbNfPkkZi", referenced from:
_D2gc3gcx3Gcx4markMFPvPviZv in --- errorlevel 1
libphobos2.a(gcx_2ed_122.o)
"_D4core5bitop3bsrFNaNbNfkZi", referenced from:
__d_arrayappendcTX in libphobos2.a(lifetime_452_6c8.o)
ld: symbol(s) not found for architecture i386
collect2: ld returned 1 exit status
make[2]: *** [generated/osx/debug/32/unittest/crc32] Error 1

I ask again, please email me the files toir.c, builtin.c, and bitop.d that you are compiling with.

Member

WalterBright commented Jul 16, 2012

On Windows:

unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop3bsrFNaNbNfkZi
unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop3btcFNaNbNfPkkZi
unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop3btrFNaNbNfPkkZi
unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop3btsFNaNbNfPkkZi
unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop2btFNaNbNfxPkkZi
unittest.obj(unittest)
Error 42: Symbol Undefined _D4core5bitop3bsfFNaNbNfkZi

On OSX:

Testing generated/osx/debug/32/unittest/crc32
Undefined symbols for architecture i386:
"_D4core5bitop3btrFNaNbNfPkkZi", referenced from:
_D2gc3gcx3Gcx11fullcollectMFZk in libphobos2.a(gcx_2ed_122.o)
"_D4core5bitop3bsfFNaNbNfkZi", referenced from:
_D2gc3gcx3Gcx11fullcollectMFZk in libphobos2.a(gcx_2ed_122.o)
"_D4core5bitop3btsFNaNbNfPkkZi", referenced from:
_D2gc3gcx3Gcx4markMFPvPviZv in --- errorlevel 1
libphobos2.a(gcx_2ed_122.o)
"_D4core5bitop3bsrFNaNbNfkZi", referenced from:
__d_arrayappendcTX in libphobos2.a(lifetime_452_6c8.o)
ld: symbol(s) not found for architecture i386
collect2: ld returned 1 exit status
make[2]: *** [generated/osx/debug/32/unittest/crc32] Error 1

I ask again, please email me the files toir.c, builtin.c, and bitop.d that you are compiling with.

@alexrp

This comment has been minimized.

Show comment Hide comment
@alexrp

alexrp Jul 16, 2012

Member

I've emailed the files, but I can guarantee you that they are bit-exactly equal to the files currently in Git HEAD. If, when you copy the files over locally, you have differences, something must have gone wrong when you pulled from GitHub...

Maybe you could describe your typical workflow in synchronizing with new changes on GitHub?

Member

alexrp commented Jul 16, 2012

I've emailed the files, but I can guarantee you that they are bit-exactly equal to the files currently in Git HEAD. If, when you copy the files over locally, you have differences, something must have gone wrong when you pulled from GitHub...

Maybe you could describe your typical workflow in synchronizing with new changes on GitHub?

@9rnsr

This comment has been minimized.

Show comment Hide comment
@9rnsr

9rnsr Jul 16, 2012

Member

I also send you the three files. Please check.

Member

9rnsr commented Jul 16, 2012

I also send you the three files. Please check.

@andralex

This comment has been minimized.

Show comment Hide comment
@andralex

andralex Jul 16, 2012

Member

@WalterBright: All you need is do git pull --rebase.

Member

andralex commented Jul 16, 2012

@WalterBright: All you need is do git pull --rebase.

@andralex

This comment has been minimized.

Show comment Hide comment
@andralex

andralex Jul 16, 2012

Member

@WalterBright: @LightBender made the great point that this is not something you're used to because until now you were the only committer.

Member

andralex commented Jul 16, 2012

@WalterBright: @LightBender made the great point that this is not something you're used to because until now you were the only committer.

WalterBright added a commit that referenced this pull request Jul 18, 2012

WalterBright added a commit that referenced this pull request Jul 18, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment