borgand
/ git-merge-svn
Last active
January 7, 2019 06:44
A helper script to set *svn:mergeinfo* property when using `git svn dcommit` on merged git branches.This makes it possible to merge two SVN branches using **git-svn**.NB! the merged-from branch **MUST** be pushed to SVN.USAGE: git merge-svn <branch name>EDIT: added exit condition when mergeinfo calculation fails to avoid pushing incomplete merge…
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/bin/bash | |
| function usage { | |
| echo "USAGE: git merge-svn <from> [<to>]" | |
| echo "" | |
| echo " from The branch name to be merged FROM" | |
| echo " to Optional branch name to be merged onto. Default: HEAD" | |
| echo "" | |
| } |
MikePearce
/ git-svn-diff.sh
Created
September 16, 2010 10:45
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/bin/bash | |
| # | |
| # git-svn-diff originally by (http://mojodna.net/2009/02/24/my-work-git-workflow.html) | |
| # modified by mike@mikepearce.net | |
| # | |
| # Generate an SVN-compatible diff against the tip of the tracking branch | |
| # Get the tracking branch (if we're on a branch) | |
| TRACKING_BRANCH=`git svn info | grep URL | sed -e 's/.*\/branches\///'` |