[llvm-commits] [llvm] r171642 - /llvm/trunk/docs/GettingStarted.rst

[Sean Silva]

How appropriate!

-- Sean Silva

On Sat, Jan 5, 2013 at 7:14 PM, Renato Golin <rengolin at systemcall.org> wrote:
> Author: rengolin
> Date: Sat Jan  5 18:14:27 2013
> New Revision: 171642
>
> URL: http://llvm.org/viewvc/llvm-project?rev=171642&view=rev
> Log:
> Add reference to dcommit on GettingStarted
>
> Signed-off-by: Renato Golin <renato.golin at linaro.org>
>
> Modified:
>     llvm/trunk/docs/GettingStarted.rst
>
> Modified: llvm/trunk/docs/GettingStarted.rst
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/GettingStarted.rst?rev=171642&r1=171641&r2=171642&view=diff
> ==============================================================================
> --- llvm/trunk/docs/GettingStarted.rst (original)
> +++ llvm/trunk/docs/GettingStarted.rst Sat Jan  5 18:14:27 2013
> @@ -633,8 +633,21 @@
>
>  This leaves your working directories on their master branches, so you'll need to
>  ``checkout`` each working branch individually and ``rebase`` it on top of its
> -parent branch.  (Note: This script is intended for relative newbies to git.  If
> -you have more experience, you can likely improve on it.)
> +parent branch.
> +
> +To commit back changes via git-svn, use ``dcommit``:
> +
> +.. code-block:: console
> +
> +  % git svn dcommit
> +
> +Note that git-svn will create one SVN commit for each Git commit you have pending,
> +so squash and edit each commit before executing ``dcommit`` to make sure they all
> +conform to the coding standards and the developers' policy.
> +
> +On success, ``dcommit`` will rebase against the HEAD of SVN, so to avoid conflict,
> +please make sure your current branch is up-to-date (via fetch/rebase) before
> +proceeding.
>
>  The git-svn metadata can get out of sync after you mess around with branches and
>  ``dcommit``. When that happens, ``git svn dcommit`` stops working, complaining
> @@ -645,6 +658,8 @@
>    % rm -rf .git/svn
>    % git svn rebase -l
>
> +Please, refer to the Git-SVN manual (``man git-svn``) for more information.
> +
>  Local LLVM Configuration
>  ------------------------
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits