Menu
Search

Forums

Forum Index

October 26, 2013
Gravatar of GitHubPosted by GitHubReply
GitHub
Gravatar of GitHub
Attachments:


Reply
  Branch: refs/heads/master
  Home:   https://github.com/D-Programming-Language/dmd
  Commit: 4d5f5fd4d975a1eda386d3baa1ecf2c847a8bdb2
      https://github.com/D-Programming-Language/dmd/commit/4d5f5fd4d975a1eda386d3baa1ecf2c847a8bdb2
  Author: Walter Bright <walter@walterbright.com>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M src/glue.c
    A test/runnable/imports/inc11239.d
    A test/runnable/test11239.d

  Log Message:
  -----------
  fix Issue 11239 - [REG2.064beta] ctRegex causes link errors with -debug since Pull2550


  Commit: 46b294ff2dd455aeeb003f8fee2a7ba794387205
      https://github.com/D-Programming-Language/dmd/commit/46b294ff2dd455aeeb003f8fee2a7ba794387205
  Author: Walter Bright <walter@walterbright.com>
  Date:   2013-10-25 (Fri, 25 Oct 2013)

  Changed paths:
    A ini/linux/bin32/dmd.conf
    A ini/linux/bin64/dmd.conf
    A ini/osx/bin/dmd.conf
    A ini/osx/bin/dmdx.conf
    A ini/windows/bin/sc.ini
    M src/arrayop.c
    M src/attrib.c
    M src/backend/cgobj.c
    M src/class.c
    M src/declaration.c
    M src/declaration.h
    M src/e2ir.c
    M src/eh.c
    M src/expression.c
    M src/expression.h
    M src/func.c
    M src/glue.c
    M src/init.c
    M src/init.h
    M src/link.c
    M src/mangle.c
    M src/mars.c
    M src/mars.h
    M src/mtype.c
    M src/root/port.c
    M src/scope.c
    M src/scope.h
    M src/statement.c
    M src/statement.h
    M src/template.c
    M src/todt.c
    M src/toobj.c
    M test/compilable/extra-files/xheader.di
    A test/compilable/imports/test11225b.d
    A test/compilable/imports/test11225c.d
    A test/compilable/test11225a.d
    M test/compilable/xheader.d
    M test/fail_compilation/diag9210a.d
    A test/fail_compilation/fail3753.d
    A test/fail_compilation/fail9665a.d
    A test/fail_compilation/fail9665b.d
    A test/fail_compilation/ice11300.d
    A test/fail_compilation/imports/ice11300a.d
    M test/fail_compilation/warn7444.d
    M test/runnable/aliasthis.d
    M test/runnable/arrayop.d
    M test/runnable/assignable.d
    M test/runnable/funclit.d
    M test/runnable/opover2.d
    A test/runnable/sctor.d
    M test/runnable/structlit.d
    M test/runnable/template9.d
    M test/runnable/test42.d
    M test/runnable/testaa.d
    M test/runnable/testaa2.d
    M test/runnable/testconst.d
    M test/runnable/testrightthis.d
    M test/runnable/xtest46.d

  Log Message:
  -----------
  Merge branch 'master' into fix11239


  Commit: acc0cb07e2cc72c344cd73e068e5100a8be8df12
      https://github.com/D-Programming-Language/dmd/commit/acc0cb07e2cc72c344cd73e068e5100a8be8df12
  Author: Andrei Alexandrescu <andrei@erdani.com>
  Date:   2013-10-26 (Sat, 26 Oct 2013)

  Changed paths:
    M src/glue.c
    A test/runnable/imports/inc11239.d
    A test/runnable/test11239.d

  Log Message:
  -----------
  Merge pull request #2661 from WalterBright/fix11239

fix Issue 11239 - [REG2.064beta] ctRegex causes link errors with -debug since Pull2550


Compare: https://github.com/D-Programming-Language/dmd/compare/e1e813bd40fa...acc0cb07e2cc
October 27, 2013
Gravatar of Jacob CarlborgPosted by Jacob Carlborg
in reply to GitHub		Reply
Jacob Carlborg
Gravatar of Jacob Carlborg
Posted in reply to GitHub


Reply
Could you please use "rebase" instead of "merge" when syncing your topic branch with master. Using merge just adds useless merge commits that add confusion.

On 27 okt 2013, at 03:59, GitHub <noreply@github.com> wrote:

>  Branch: refs/heads/master
>  Home:   https://github.com/D-Programming-Language/dmd
>  Commit: 4d5f5fd4d975a1eda386d3baa1ecf2c847a8bdb2
>      https://github.com/D-Programming-Language/dmd/commit/4d5f5fd4d975a1eda386d3baa1ecf2c847a8bdb2
>  Author: Walter Bright <walter@walterbright.com>
>  Date:   2013-10-23 (Wed, 23 Oct 2013)
> 
>  Changed paths:
>    M src/glue.c
>    A test/runnable/imports/inc11239.d
>    A test/runnable/test11239.d
> 
>  Log Message:
>  -----------
>  fix Issue 11239 - [REG2.064beta] ctRegex causes link errors with -debug since Pull2550
> 
> 
>  Commit: 46b294ff2dd455aeeb003f8fee2a7ba794387205
>      https://github.com/D-Programming-Language/dmd/commit/46b294ff2dd455aeeb003f8fee2a7ba794387205
>  Author: Walter Bright <walter@walterbright.com>
>  Date:   2013-10-25 (Fri, 25 Oct 2013)
> 
>  Changed paths:
>    A ini/linux/bin32/dmd.conf
>    A ini/linux/bin64/dmd.conf
>    A ini/osx/bin/dmd.conf
>    A ini/osx/bin/dmdx.conf
>    A ini/windows/bin/sc.ini
>    M src/arrayop.c
>    M src/attrib.c
>    M src/backend/cgobj.c
>    M src/class.c
>    M src/declaration.c
>    M src/declaration.h
>    M src/e2ir.c
>    M src/eh.c
>    M src/expression.c
>    M src/expression.h
>    M src/func.c
>    M src/glue.c
>    M src/init.c
>    M src/init.h
>    M src/link.c
>    M src/mangle.c
>    M src/mars.c
>    M src/mars.h
>    M src/mtype.c
>    M src/root/port.c
>    M src/scope.c
>    M src/scope.h
>    M src/statement.c
>    M src/statement.h
>    M src/template.c
>    M src/todt.c
>    M src/toobj.c
>    M test/compilable/extra-files/xheader.di
>    A test/compilable/imports/test11225b.d
>    A test/compilable/imports/test11225c.d
>    A test/compilable/test11225a.d
>    M test/compilable/xheader.d
>    M test/fail_compilation/diag9210a.d
>    A test/fail_compilation/fail3753.d
>    A test/fail_compilation/fail9665a.d
>    A test/fail_compilation/fail9665b.d
>    A test/fail_compilation/ice11300.d
>    A test/fail_compilation/imports/ice11300a.d
>    M test/fail_compilation/warn7444.d
>    M test/runnable/aliasthis.d
>    M test/runnable/arrayop.d
>    M test/runnable/assignable.d
>    M test/runnable/funclit.d
>    M test/runnable/opover2.d
>    A test/runnable/sctor.d
>    M test/runnable/structlit.d
>    M test/runnable/template9.d
>    M test/runnable/test42.d
>    M test/runnable/testaa.d
>    M test/runnable/testaa2.d
>    M test/runnable/testconst.d
>    M test/runnable/testrightthis.d
>    M test/runnable/xtest46.d
> 
>  Log Message:
>  -----------
>  Merge branch 'master' into fix11239
> 
> 
>  Commit: acc0cb07e2cc72c344cd73e068e5100a8be8df12
>      https://github.com/D-Programming-Language/dmd/commit/acc0cb07e2cc72c344cd73e068e5100a8be8df12
>  Author: Andrei Alexandrescu <andrei@erdani.com>
>  Date:   2013-10-26 (Sat, 26 Oct 2013)
> 
>  Changed paths:
>    M src/glue.c
>    A test/runnable/imports/inc11239.d
>    A test/runnable/test11239.d
> 
>  Log Message:
>  -----------
>  Merge pull request #2661 from WalterBright/fix11239
> 
> fix Issue 11239 - [REG2.064beta] ctRegex causes link errors with -debug since Pull2550
> 
> 
> Compare: https://github.com/D-Programming-Language/dmd/compare/e1e813bd40fa...acc0cb07e2cc
> _______________________________________________
> dmd-internals mailing list
> dmd-internals@puremagic.com
> http://lists.puremagic.com/mailman/listinfo/dmd-internals

-- 
/Jacob Carlborg

_______________________________________________
dmd-internals mailing list
dmd-internals@puremagic.com
http://lists.puremagic.com/mailman/listinfo/dmd-internals