Skip to content

Instantly share code, notes, and snippets.

@johnbillion

johnbillion/merge.sh

Created December 21, 2015 05:50
Show Gist options
  • Star 5 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save johnbillion/22dcc4ae736a3e8d022c to your computer and use it in GitHub Desktop.
Save johnbillion/22dcc4ae736a3e8d022c to your computer and use it in GitHub Desktop.
Download ZIP
Raw
merge.sh
#!/bin/bash
REV=$1
svn up --ignore-externals . > /dev/null
svn merge -c$REV ../../trunk .
LOG=$(svn log -r$REV ../../trunk | grep -v '\-------' | tail -n +3)
BRANCH=$(basename $(pwd))
echo -en "$LOG\n\nMerges [$REV] to the $BRANCH branch." | pbcopy
echo ""
pbpaste
echo ""
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment