Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Reverted accidental commit | Johannes Dahlström | 2012-03-13 | 1 | -2/+2 |
| | | | | svn changeset:23229/svn branch:6.8 | ||||
* | [merge from 6.7] fixes #8505 | Johannes Dahlström | 2012-03-13 | 1 | -2/+2 |
| | | | | svn changeset:23227/svn branch:6.8 | ||||
* | Abort if merge fails | Artur Signell | 2012-02-02 | 1 | -0/+6 |
| | | | | svn changeset:22856/svn branch:6.8 | ||||
* | Optionally read password from file | Artur Signell | 2012-02-02 | 1 | -0/+5 |
| | | | | svn changeset:22850/svn branch:6.8 | ||||
* | merge.sh now works in directories other than /versions/, like merge-all.sh ↵ | Johannes Dahlström | 2012-01-31 | 1 | -2/+5 |
| | | | | | | already does svn changeset:22842/svn branch:6.8 | ||||
* | User SVN_USER and SVN_PASS if given | Artur Signell | 2012-01-27 | 1 | -1/+7 |
| | | | | svn changeset:22807/svn branch:6.8 | ||||
* | Bugfix: concatenate merge commands properly | Johannes Dahlström | 2012-01-27 | 1 | -1/+1 |
| | | | | svn changeset:22804/svn branch:6.8 | ||||
* | Added exit codes | Artur Signell | 2012-01-27 | 1 | -2/+3 |
| | | | | svn changeset:22800/svn branch:6.8 | ||||
* | Added missing line | Artur Signell | 2012-01-27 | 1 | -1/+1 |
| | | | | svn changeset:22786/svn branch:6.8 | ||||
* | Scripts for easing merge from 6.7 | Artur Signell | 2012-01-27 | 2 | -0/+102 |
svn changeset:22783/svn branch:6.8 |