Last active
December 24, 2015 11:19
-
-
Save vivekn/6789920 to your computer and use it in GitHub Desktop.
svn merge to trunk
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
| svn sw $1 | |
| lines=`svn merge --accept postpone $2|grep -y "conflict"|wc -l` | |
| if [ lines -eq 0 ] | |
| then | |
| svn ci -m "Merged Trunk" | |
| svn sw $1 | |
| svn up | |
| lines2=`svn merge --reintegrate $2|grep -y "conflict"|wc -l` | |
| if [ lines2 -eq 0 ] | |
| then | |
| svn ci -m "$3" | |
| fi | |
| fi |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment