11 Commits (41d9c4569ddb345d3f99fb66874caca7df93cdde)

Author SHA1 Message Date
  Leif Åstrand 2a60b68954 Fix copy/paste error in teamcity integration 12 years ago
  Leif Åstrand 76bfc960d3 Adjust merge check to work more nicely with team city 12 years ago
  Leif Åstrand d0cf1686b2 Add script for automatically checking for unmerged commits 12 years ago
  Johannes Dahlström 0681a2f396 Reverted accidental commit 12 years ago
  Johannes Dahlström 59826767eb [merge from 6.7] fixes #8505 12 years ago
  Artur Signell 67037e59a4 Abort if merge fails 12 years ago
  Artur Signell c8dbc25492 Optionally read password from file 12 years ago
  Johannes Dahlström e5b55ab465 merge.sh now works in directories other than /versions/, like merge-all.sh already does 12 years ago
  Artur Signell d472d9e143 User SVN_USER and SVN_PASS if given 12 years ago
  Johannes Dahlström f315689eff Bugfix: concatenate merge commands properly 12 years ago
  Artur Signell af370437a9 Added exit codes 12 years ago
  Artur Signell f125516994 Added missing line 12 years ago
  Artur Signell f08f86caf9 Scripts for easing merge from 6.7 12 years ago