[Bf-docboard] trying to commit or land a diff

[Tobias Heinke]

Hi Julian,
I reverted the commit, (nothing got broken ;)
you don't need to (manually) create a diff for committing, only:

     svn commit -m "your message"

I tested the cmd commit following 
http://svnbook.red-bean.com/en/1.7/svn.ref.svn.c.commit.html

If you want to limit to a file(s) you have to save the message in a .txt 
(resulted in rBM4214):

     svn commit -F "path-to/msg.txt" "path-to/manual/editors/timeline.rst"

The wiki page is about Blenders source code repository (manual related 
info is all in /about).
I use Tortoise - can recommend it.

Please try again,
Tobias


Am 06.04.2018 um 14:05 schrieb Aaron Carlisle:
> This is a bit more complicated without "-m" you need to have a command 
> line editor setup
> see http://help.collab.net/index.jsp?topic=/faq/editorcommandline.html
>
> On Fri, Apr 6, 2018 at 4:11 AM, Julian Darley <juliandarley at gmail.com 
> <mailto:juliandarley at gmail.com>> wrote:
>
>     re:
>     [developer.blender.org <http://developer.blender.org>] [Request, 2
>     lines] D3134: small syntactical fix
>     https://developer.blender.org/D3134
>     <https://developer.blender.org/D3134>
>
>     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
>     https://docs.blender.org/manual/en/dev/about/contribute/patch_commit.html
>     <https://docs.blender.org/manual/en/dev/about/contribute/patch_commit.html>,
>     but i cannot work how to get my diff into the svn (with which i am
>     very unfamiliar).
>
>     i tried the following:
>
>         C:\blender_docs>svn update
>         Updating '.':
>         At revision 4202.
>
>         C:\blender_docs>svn diff > filename.diff
>
>         C:\blender_docs>svn commit
>         svn: E205007: Commit failed (details follow):
>         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
>         svn: E205007: None of the environment variables SVN_EDITOR,
>         VISUAL or EDITOR are set, and no 'editor-cmd' run-time
>         configuration option was found
>
>         C:\blender_docs>
>
>     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.
>
>     instead of using the command line, i tried to use tortoisesvn.
>     however, on this page (which may or may not be relevant),
>     https://wiki.blender.org/index.php/Dev:Doc/Building_Blender/Windows/svn
>     <https://wiki.blender.org/index.php/Dev:Doc/Building_Blender/Windows/svn>,
>     i read this:
>
>
>             Using TortoiseSVN
>
>         *Under no circumstances*should you set the SVN repository for
>         the|C:\blender-git|folder, because it could cause major
>         conflicts with the git repository.
>
>     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.
>
>     thanks,
>     julian
>
>
>     -------- Forwarded Message --------
>     Subject: 	[developer.blender.org <http://developer.blender.org>]
>     [Request, 2 lines] D3134: small syntactical fix
>     Date: 	Fri, 6 Apr 2018 09:44:53 +0200
>     From: 	Julian <noreply at developer.blender.org>
>     <mailto:noreply at developer.blender.org>
>     To: 	julian at mysteriousmovies.com <mailto:julian at mysteriousmovies.com>
>
>
>
>     View Revision <https://developer.blender.org/D3134>
>     Julian (juliand) created this revision.
>     Julian (juliand) added a reviewer: Joshua Leung (aligorith).
>
>
>     *REVISION SUMMARY*
>
>     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).
>
>
>     *REVISION DETAIL*
>     https://developer.blender.org/D3134
>     <https://developer.blender.org/D3134>
>
>     *AFFECTED FILES*
>     manual/editors/timeline.rst
>
>     *EMAIL PREFERENCES*
>     https://developer.blender.org/settings/panel/emailpreferences/
>     <https://developer.blender.org/settings/panel/emailpreferences/>
>
>     *To: *Julian (juliand), Joshua Leung (aligorith)
>
>     <http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient>
>     	Virus-free. www.avg.com
>     <http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient>
>
>
>     <#m_5041649239113938754_DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2>
>
>     _______________________________________________
>     Bf-docboard mailing list
>     Bf-docboard at blender.org <mailto:Bf-docboard at blender.org>
>     https://lists.blender.org/mailman/listinfo/bf-docboard
>     <https://lists.blender.org/mailman/listinfo/bf-docboard>
>
>
>
>
> -- 
> Aaron Carlisle
>
> Project administrator for the Blender 3D Documentation Project
> Email: carlisle.b3d at gmail.com <mailto:carlisle.b3d at gmail.com>
> Website: https://blendify.github.io <https://blendify.github.io/>
>
>
>
> _______________________________________________
> Bf-docboard mailing list
> Bf-docboard at blender.org
> https://lists.blender.org/mailman/listinfo/bf-docboard

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.blender.org/pipermail/bf-docboard/attachments/20180409/2044bf0c/attachment.html>