www.digitalmars.com         C & C++   DMDScript  

digitalmars.D - d-p-l.org statement.html

reply Johann MacDonagh <johann.macdonagh..no spam..gmail.com> writes:
http://www.d-programming-language.org/statement.html

Scroll down to the bottom. Looks like someone committed a file that had 
merge markup in it. I'm not even sure how git would let you do this.
Jul 13 2011
next sibling parent reply Jonathan M Davis <jmdavisProg gmx.com> writes:
On Wednesday 13 July 2011 21:49:00  wrote:

 http://www.d-programming-language.org/statement.html
 
 Scroll down to the bottom. Looks like someone committed a file that had
 merge markup in it. I'm not even sure how git would let you do this.


Easily. When it gives you a merge conflict, you just commit the file generated 
from the merge without dealing with the conflicts - or you do try and deal with 
the conflicts but you miss one. That sort of thing is caught very easily with 
code, because it's not going to compile with all of those >>>>>>>>>> and 
<<<<<<< in the file. ddoc, on the other hand, can legally contain >>>>>>> and 
<<<<<<<, so the documentation compiled just fine. No one caught it, and it 
ended up in the master repository.

-  Jonathan M Davis
Jul 13 2011
parent Johann MacDonagh <johann.macdonagh.no spam.gmail.com> writes:
 Easily. When it gives you a merge conflict, you just commit the file generated
 from the merge without dealing with the conflicts - or you do try and deal with
 the conflicts but you miss one. That sort of thing is caught very easily with
 code, because it's not going to compile with all of those>>>>>>>>>>  and
 <<<<<<<  in the file. ddoc, on the other hand, can legally contain>>>>>>>  and
 <<<<<<<, so the documentation compiled just fine. No one caught it, and it
 ended up in the master repository.



I know, but usually git is keeping track of a merge and won't let a file 
with merge markup be committed unless you specifically force it. If you 
go through the normal merge conflict resolution process all of that 
should be removed. Anyway, it doesn't look like the markup got 
committed, I think it was just generated from a file that hadn't been 
resolved yet.
Jul 16 2011
prev sibling next sibling parent reply Loopback <elliott.darfink gmail.com> writes:
While speaking of the website, how come
"http://d-programming-language.org/language_reference.html"
just redirects one instantly to the lexical section?

language-reference.html

<html>
<head>
<title>D Runtime Library</title>
<meta http-equiv="Refresh" content="0; URL=lex.html">
</head>
<body>
</body>
</html>
Jul 14 2011
next sibling parent Trass3r <un known.com> writes:
 While speaking of the website, how come
 "http://d-programming-language.org/language_reference.html"
 just redirects one instantly to the lexical section?


Yep, that's broken too.
Jul 14 2011
prev sibling parent reply "Jonathan M Davis" <jmdavisProg gmx.com> writes:
On 2011-07-14 12:12, Loopback wrote:

 While speaking of the website, how come
 "http://d-programming-language.org/language_reference.html"
 just redirects one instantly to the lexical section?
 
 language-reference.html
 
 <html>
 <head>
 <title>D Runtime Library</title>
 <meta http-equiv="Refresh" content="0; URL=lex.html">
 </head>
 <body>
 </body>
 </html>


Please report issues with the website at d.puremagic.com/issues

When creating the bug, choose D (not DStress or puremagic.com) and select the 
websites component.

- Jonathan M Davis
Jul 14 2011
parent Johann MacDonagh <johann.macdonagh.no spam.gmail.com> writes:
 Please report issues with the website at d.puremagic.com/issues


Done. http://d.puremagic.com/issues/show_bug.cgi?id=6335
Jul 16 2011
prev sibling parent Trass3r <un known.com> writes:
Also at http://www.d-programming-language.org/phobos/std_getopt.html
I get

Depending on the type of the pointer being bound, getopt recognizes the  
following kinds of options:

  (OL     // <---
Boolean options. These are the simplest options; all they do is set a  
Boolean to true:
Jul 15 2011