llvm.org GIT mirror llvm / 7e4aeba
Added new section to the git-svn getting started section that provides a 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 Michael Gottesman 7 years ago
1 changed file(s) with 28 addition(s) and 0 deletion(s). Raw diff Collapse all Expand all
638638 ``checkout`` each working branch individually and ``rebase`` it on top of its
639639 parent branch.
640640
641 For those who wish to be able to update an llvm repo in a simpler fashion,
642 consider placing the following git script in your path under the name
643 ``git-svnup``:
644
645 .. code-block:: bash
646
647 #!/bin/bash
648
649 STATUS=$(git status -s | grep -v "??")
650
651 if [ ! -z "$STATUS" ]; then
652 STASH="yes"
653 git stash >/dev/null
654 fi
655
656 git fetch
657 old_branch=$(git rev-parse --abbrev-ref HEAD)
658 git checkout master 2> /dev/null
659 git svn rebase -l
660 git checkout $old_breanch 2> /dev/null
661
662 if [ ! -z $STASH ]; then
663 git stash pop >/dev/null
664 fi
665
666 Then to perform the aforementioned update steps go into your source directory
667 and just type ``git-svnup`` or ``git svnup`` and everything will just work.
668
641669 To commit back changes via git-svn, use ``dcommit``:
642670
643671 .. code-block:: console