32 Commits (504809f3f1e49328e33b17fac2f3f4ceab276665)

Author SHA1 Message Date
  Artur Signell 44f672bf85 Script for installing build artifacts to the local Maven repository 10 years ago
  Jonatan Kronqvist 3cd07c2d07 Remove the automerge script 10 years ago
  Jonatan Kronqvist 493432007d Remove the automerge script 10 years ago
  Artur Signell 6c022639ad Merge from 7.1 to 7.2 10 years ago
  Artur Signell ee4ae9fac8 Merge from 7.1 to 7.2 10 years ago
  Artur Signell 34029194d6 Merge from 7.2 10 years ago
  Artur Signell 3be4326317 Email author about merge failures 10 years ago
  Artur Signell bb2a440037 Use different exit codes for different errors 10 years ago
  Leif Åstrand 31a3f4fccb Fix typo in automerge script 10 years ago
  Leif Åstrand fe8d330c3c Escape \ in commit messages 11 years ago
  Leif Åstrand 8d1ccd76be Ignore changes merged from the previous maintenance branch 11 years ago
  Leif Åstrand 5a9303869c Commit and push everything before a conflicting commit 11 years ago
  Leif Åstrand cc995bbe0f Update merge specification for the master branch. 11 years ago
  Leif Åstrand d09b586ece Don't start merging if there are uncommitted changes 11 years ago
  Leif Åstrand 888d34c55c Update merge script to merge 7.0 to 7.1 11 years ago
  Artur Signell 5a5066a8c3 Include commit id and message in merge commit message 11 years ago
  Artur Signell 33e114bd3b Ensure no-op merges get a change id 11 years ago
  Artur Signell 1853dea1b9 Script for merging changes from a bugfix branch into master (#11299) 11 years ago
  Leif Åstrand 7abb5e3397 Don't provide details to teamcity as it nowadays gets those from stdout 11 years ago
  Leif Åstrand 72a1641a0b Fix merge checker issues 11 years ago
  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