<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
</head>
<body text="#000000" bgcolor="#FFFFFF">
re:<br>
[developer.blender.org] [Request, 2 lines] D3134: small syntactical
fix<br>
<a class="moz-txt-link-freetext" href="https://developer.blender.org/D3134">https://developer.blender.org/D3134</a><br>
<br>
i have tried to figure out how to add this as a commit now that i
have been added to the documentation project, but i think i have
failed. i looked at the text on
<a class="moz-txt-link-freetext" href="https://docs.blender.org/manual/en/dev/about/contribute/patch_commit.html">https://docs.blender.org/manual/en/dev/about/contribute/patch_commit.html</a>,
but i cannot work how to get my diff into the svn (with which i am
very unfamiliar).<br>
<br>
i tried the following:<br>
<blockquote>C:\blender_docs>svn update<br>
Updating '.':<br>
At revision 4202.<br>
<br>
C:\blender_docs>svn diff > filename.diff<br>
<br>
C:\blender_docs>svn commit<br>
svn: E205007: Commit failed (details follow):<br>
svn: E205007: Could not use external editor to fetch log message;
consider setting the $SVN_EDITOR environment variable or using the
--message (-m) or --file (-F) options<br>
svn: E205007: None of the environment variables SVN_EDITOR, VISUAL
or EDITOR are set, and no 'editor-cmd' run-time configuration
option was found<br>
<br>
C:\blender_docs><br>
</blockquote>
i deliberately did not add a -m message as i was hoping that might
trigger some useful instruction, but the above did not help me. i am
not sure whether i really do need to set environment variables. <br>
<br>
instead of using the command line, i tried to use tortoisesvn.
however, on this page (which may or may not be relevant),
<a class="moz-txt-link-freetext" href="https://wiki.blender.org/index.php/Dev:Doc/Building_Blender/Windows/svn">https://wiki.blender.org/index.php/Dev:Doc/Building_Blender/Windows/svn</a>,
i read this:<br>
<blockquote>
<h2 style="font-size: 13pt; overflow: hidden; margin: 0px;
padding-top: 0.5em; padding-bottom: 0.17em; color: rgb(51, 51,
51); font-family: "Lucida Grande", "Lucida Sans
Unicode", "Lucida Sans", Lucida, Verdana,
sans-serif; font-style: normal; font-variant-ligatures: normal;
font-variant-caps: normal; letter-spacing: normal; orphans: 2;
text-align: left; text-indent: 0px; text-transform: none;
white-space: normal; widows: 2; word-spacing: 0px;
-webkit-text-stroke-width: 0px; background-color: rgb(238, 238,
238); text-decoration-style: initial; text-decoration-color:
initial;"><span class="mw-headline" id="Using_TortoiseSVN"
style="display: inline; padding-top: 75px;">Using TortoiseSVN</span></h2>
<p style="color: rgb(51, 51, 51); font-family: "Lucida
Grande", "Lucida Sans Unicode", "Lucida
Sans", Lucida, Verdana, sans-serif; font-size: 12px;
line-height: 1.5em; margin: 0.4em 0px 0.5em; text-align:
justify; font-style: normal; font-variant-ligatures: normal;
font-variant-caps: normal; font-weight: 400; letter-spacing:
normal; orphans: 2; text-indent: 0px; text-transform: none;
white-space: normal; widows: 2; word-spacing: 0px;
-webkit-text-stroke-width: 0px; background-color: rgb(238, 238,
238); text-decoration-style: initial; text-decoration-color:
initial;"><b>Under no circumstances</b><span> </span>should you
set the SVN repository for the<span> </span><code>C:\blender-git</code><span> </span>folder,
because it could cause major conflicts with the git repository.</p>
</blockquote>
which stopped me in my tracks. causing conflicts is exactly what i
want to avoid. my tiny change is unlikely to do any damage, but i
really would appreciate some accurate and comprehensive instructions
on how to commit or 'land' my changes, ideally both from the command
line and with tortoisesvn.<br>
<br>
thanks,<br>
<div class="moz-forward-container">julian<br>
<br>
<br>
-------- Forwarded Message --------
<table class="moz-email-headers-table" cellspacing="0"
cellpadding="0" border="0">
<tbody>
<tr>
<th nowrap="nowrap" valign="BASELINE" align="RIGHT">Subject:
</th>
<td>[developer.blender.org] [Request, 2 lines] D3134: small
syntactical fix</td>
</tr>
<tr>
<th nowrap="nowrap" valign="BASELINE" align="RIGHT">Date: </th>
<td>Fri, 6 Apr 2018 09:44:53 +0200</td>
</tr>
<tr>
<th nowrap="nowrap" valign="BASELINE" align="RIGHT">From: </th>
<td>Julian <a class="moz-txt-link-rfc2396E" href="mailto:noreply@developer.blender.org"><noreply@developer.blender.org></a></td>
</tr>
<tr>
<th nowrap="nowrap" valign="BASELINE" align="RIGHT">To: </th>
<td><a class="moz-txt-link-abbreviated" href="mailto:julian@mysteriousmovies.com">julian@mysteriousmovies.com</a></td>
</tr>
</tbody>
</table>
<br>
<br>
<a style="text-decoration: none; padding: 4px 8px; margin: 0 8px
8px; float: right; color: #464C5C; font-weight: bold;
border-radius: 3px; background-color: #F7F7F9; background-image:
linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block;
border: 1px solid rgba(71,87,120,.2);"
href="https://developer.blender.org/D3134" rel="noreferrer"
moz-do-not-send="true">View Revision</a>
<table>
<tbody>
<tr>
<td style="">Julian (juliand) created this revision.<br>
Julian (juliand) added a reviewer: Joshua Leung
(aligorith).
</td>
</tr>
</tbody>
</table>
<br>
<div><strong>REVISION SUMMARY</strong>
<div>
<p>this is mainly to test how to commit directly without being
reviewed. in case the commit process goes wrong or fails to
happen, i have added a reviewer (the module owner).</p>
</div>
</div>
<br>
<div><strong>REVISION DETAIL</strong>
<div><a href="https://developer.blender.org/D3134"
rel="noreferrer" moz-do-not-send="true">https://developer.blender.org/D3134</a></div>
</div>
<br>
<div><strong>AFFECTED FILES</strong>
<div>
<div>manual/editors/timeline.rst</div>
</div>
</div>
<br>
<div><strong>EMAIL PREFERENCES</strong>
<div><a
href="https://developer.blender.org/settings/panel/emailpreferences/"
rel="noreferrer" moz-do-not-send="true">https://developer.blender.org/settings/panel/emailpreferences/</a></div>
</div>
<br>
<div><strong>To: </strong>Julian (juliand), Joshua Leung
(aligorith)<br>
</div>
</div>
<div id="DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2"><br />
<table style="border-top: 1px solid #D3D4DE;">
<tr>
<td style="width: 55px; padding-top: 13px;"><a href="http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient" target="_blank"><img src="https://ipmcdn.avast.com/images/icons/icon-envelope-tick-green-avg-v1.png" alt="" width="46" height="29" style="width: 46px; height: 29px;" /></a></td>
<td style="width: 470px; padding-top: 12px; color: #41424e; font-size: 13px; font-family: Arial, Helvetica, sans-serif; line-height: 18px;">Virus-free. <a href="http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient" target="_blank" style="color: #4453ea;">www.avg.com</a>
</td>
</tr>
</table><a href="#DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2" width="1" height="1"> </a></div></body>
</html>