[prev in list] [next in list] [prev in thread] [next in thread]
List: kwrite-devel
Subject: Re: Review Request 114395: add partial RST support to cmake.xml
From: "Christoph Cullmann" <cullmann () kde ! org>
Date: 2013-12-27 19:41:01
Message-ID: 20131227194101.27341.18160 () probe ! kde ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
> On Dec. 27, 2013, 7:36 p.m., Matthew Woehlke wrote:
> > I see that there are not many feature-branch merges in kate.git; is it okay to \
> > commit this as a true merge, or is it preferred to rebase it and commit on master \
> > with linear history?
> > p.s. Posted with git-rb; will not actually create a .gitlog file when it lands \
> > ;-) (but allows also reviewing the commit log with current RB).
True merge is ok ;) The history is anyway not linear ;)
- Christoph
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/114395/#review46216
-----------------------------------------------------------
On Dec. 27, 2013, 7:34 p.m., Matthew Woehlke wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/114395/
> -----------------------------------------------------------
>
> (Updated Dec. 27, 2013, 7:34 p.m.)
>
>
> Review request for Kate.
>
>
> Repository: kate
>
>
> Description
> -------
>
> Add support for CMake 3.0 "long bracket" syntax (for string quoting and comments), \
> and for use of RST in RST bracket comments. (RST in normal comments can't be \
> trivially highlighted, as it relies on implicit removal of the leading comment \
> character, and thus is not supported.)
>
> Diffs
> -----
>
> .gitlog PRE-CREATION
> part/syntax/data/cmake.xml a7dcebc21fa250d3b7fbf20e7951e499f73b2ea2
>
> Diff: https://git.reviewboard.kde.org/r/114395/diff/
>
>
> Testing
> -------
>
> Highlighting works as expected when adding new syntax constructs to a CMake file.
>
>
> Thanks,
>
> Matthew Woehlke
>
>
[Attachment #5 (text/html)]
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 \
solid;"> <tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/114395/">https://git.reviewboard.kde.org/r/114395/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <p style="margin-top: 0;">On December 27th, 2013, 7:36 p.m. UTC, <b>Matthew \
Woehlke</b> wrote:</p> <blockquote style="margin-left: 1em; border-left: 2px solid \
#d0d0d0; padding-left: 10px;"> <pre style="white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">I see that there are not many feature-branch merges in kate.git; is it \
okay to commit this as a true merge, or is it preferred to rebase it and commit on \
master with linear history?
p.s. Posted with git-rb; will not actually create a .gitlog file when it lands ;-) \
(but allows also reviewing the commit log with current RB).</pre> </blockquote>
</blockquote>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">True merge is ok ;) The \
history is anyway not linear ;)</pre> <br />
<p>- Christoph</p>
<br />
<p>On December 27th, 2013, 7:34 p.m. UTC, Matthew Woehlke wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" \
style="background-image: \
url('https://git.reviewboard.kde.org/static/rb/images/review_request_box_top_bg.ab6f3b1072c9.png'); \
background-position: left top; background-repeat: repeat-x; border: 1px black \
solid;"> <tr>
<td>
<div>Review request for Kate.</div>
<div>By Matthew Woehlke.</div>
<p style="color: grey;"><i>Updated Dec. 27, 2013, 7:34 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
kate
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" \
style="border: 1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">Add support for CMake 3.0 "long bracket" syntax (for string \
quoting and comments), and for use of RST in RST bracket comments. (RST in normal \
comments can't be trivially highlighted, as it relies on implicit removal of the \
leading comment character, and thus is not supported.)</pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">Highlighting works as expected when adding new syntax constructs to a \
CMake file.</pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>.gitlog <span style="color: grey">(PRE-CREATION)</span></li>
<li>part/syntax/data/cmake.xml <span style="color: \
grey">(a7dcebc21fa250d3b7fbf20e7951e499f73b2ea2)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/114395/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
_______________________________________________
KWrite-Devel mailing list
KWrite-Devel@kde.org
https://mail.kde.org/mailman/listinfo/kwrite-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic