Added new section to the git-svn getting started section that provides a
authorMichael Gottesman <mgottesman@apple.com>
Fri, 25 Jan 2013 19:31:09 +0000 (19:31 +0000)
committerMichael Gottesman <mgottesman@apple.com>
Fri, 25 Jan 2013 19:31:09 +0000 (19:31 +0000)
custom git script called git-svnup which handles all of the work of
using the git-mirrors/keeping the git-svn numbers in sync.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@173472 91177308-0d34-0410-b5e6-96231b3b80d8

docs/GettingStarted.rst

index 596ae3c00a9c227a9c9e701dc22f78f13e0513f6..7ea5473c2865e1a01a6d4d64dc5e421fa56033e9 100644 (file)
@@ -639,6 +639,34 @@ 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.
 
+For those who wish to be able to update an llvm repo in a simpler fashion,
+consider placing the following git script in your path under the name
+``git-svnup``:
+
+.. code-block:: bash
+
+  #!/bin/bash
+
+  STATUS=$(git status -s | grep -v "??")
+
+  if [ ! -z "$STATUS" ]; then
+      STASH="yes"
+      git stash >/dev/null
+  fi
+
+  git fetch
+  old_branch=$(git rev-parse --abbrev-ref HEAD)
+  git checkout master 2> /dev/null
+  git svn rebase -l
+  git checkout $old_breanch 2> /dev/null
+
+  if [ ! -z $STASH ]; then
+      git stash pop >/dev/null
+  fi
+
+Then to perform the aforementioned update steps go into your source directory
+and just type ``git-svnup`` or ``git svnup`` and everything will just work.
+
 To commit back changes via git-svn, use ``dcommit``:
 
 .. code-block:: console