summaryrefslogtreecommitdiffstats
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* Reverted accidental commitJohannes Dahlström2012-03-131-2/+2
| | | | svn changeset:23229/svn branch:6.8
* [merge from 6.7] fixes #8505Johannes Dahlström2012-03-131-2/+2
| | | | svn changeset:23227/svn branch:6.8
* Abort if merge failsArtur Signell2012-02-021-0/+6
| | | | svn changeset:22856/svn branch:6.8
* Optionally read password from fileArtur Signell2012-02-021-0/+5
| | | | svn changeset:22850/svn branch:6.8
* merge.sh now works in directories other than /versions/, like merge-all.sh ↵Johannes Dahlström2012-01-311-2/+5
| | | | | | already does svn changeset:22842/svn branch:6.8
* User SVN_USER and SVN_PASS if givenArtur Signell2012-01-271-1/+7
| | | | svn changeset:22807/svn branch:6.8
* Bugfix: concatenate merge commands properlyJohannes Dahlström2012-01-271-1/+1
| | | | svn changeset:22804/svn branch:6.8
* Added exit codesArtur Signell2012-01-271-2/+3
| | | | svn changeset:22800/svn branch:6.8
* Added missing lineArtur Signell2012-01-271-1/+1
| | | | svn changeset:22786/svn branch:6.8
* Scripts for easing merge from 6.7Artur Signell2012-01-272-0/+102
svn changeset:22783/svn branch:6.8