Artur Signell
44f672bf85
Script for installing build artifacts to the local Maven repository
Change-Id: I6cc4553a54d7d4ed7271ea0eb59386516fd96ca5
10 years ago
Jonatan Kronqvist
3cd07c2d07
Remove the automerge script
This makes it impossible to run this script by mistake, as it should
no longer be used with the new master based workflow.
Change-Id: I0400ecb20bb135c09e0414196f692dd8e9ffa510
10 years ago
Jonatan Kronqvist
493432007d
Remove the automerge script
This makes it impossible to run this script by mistake, as it should
no longer be used with the new master based workflow.
Change-Id: I0400ecb20bb135c09e0414196f692dd8e9ffa510
10 years ago
Artur Signell
6c022639ad
Merge from 7.1 to 7.2
Merge: no
Change-Id: Ibfe17c35ec72985823389c75a5c3135998443068
10 years ago
Artur Signell
ee4ae9fac8
Merge from 7.1 to 7.2
Change-Id: I3db340a7c971be6abf18514f044114802edfc4de
10 years ago
Artur Signell
34029194d6
Merge from 7.2
Change-Id: Ic52a0be061bf22058ac9b831f3e965547a1b8933
10 years ago
Artur Signell
3be4326317
Email author about merge failures
Change-Id: I58554c9095e815087bee321dfc57e9e45b5b0481
10 years ago
Artur Signell
bb2a440037
Use different exit codes for different errors
Change-Id: I7e5bba7f290ec9e6c482231bde3c12d13a3a80ea
10 years ago
Leif Åstrand
31a3f4fccb
Fix typo in automerge script
Change-Id: I41ca4f5cd21b85ead3ae2888d5c1b94cb40f1bd8
10 years ago
Leif Åstrand
fe8d330c3c
Escape \ in commit messages
Change-Id: I1c5773dd593d7877833a5b1798f3e812b53a1b1e
11 years ago
Leif Åstrand
8d1ccd76be
Ignore changes merged from the previous maintenance branch
Change-Id: I16a203db76fd6dc7e091a2b2708f80b9d4cef079
11 years ago
Leif Åstrand
5a9303869c
Commit and push everything before a conflicting commit
Change-Id: Ifdc45e2b0f540ac8212aaca835b9d11c18078eb5
11 years ago
Leif Åstrand
cc995bbe0f
Update merge specification for the master branch.
Change-Id: Ia8ad2d2e44e2d29bfa9e2271e4e4cad0a672ec22
11 years ago
Leif Åstrand
d09b586ece
Don't start merging if there are uncommitted changes
Change-Id: Ic1211e914162be6910caae10fcfc7deebc5b4ad3
11 years ago
Leif Åstrand
888d34c55c
Update merge script to merge 7.0 to 7.1
* Refactor so that source and target branches are defined in
variables in the beginning of the script.
* Pass a dummy commit message to the merge to avoid opening an editor
while running the script
Merge: manual
Change-Id: I76c001b3bfcfd2dbb1ce2e9ec1b730641df31a77
11 years ago
Artur Signell
5a5066a8c3
Include commit id and message in merge commit message
Change-Id: I2557eddcb4fbd4fd1ec5c608a0d73c7fa1b243b6
11 years ago
Artur Signell
33e114bd3b
Ensure no-op merges get a change id
Change-Id: Icda1db985b3a0654fa1274e700cddfe2f990df12
11 years ago
Artur Signell
1853dea1b9
Script for merging changes from a bugfix branch into master (#11299)
* Supports "Merge: no" for changesets which should be skipped, e.g. release notes updates.
* Supports "Merge: manual" which will causes the merge to stop, requiring somebody to manually merge to change before continuing
Change-Id: If5d1291ec77f4c1e31b3afb8420a45ecceedfa15
11 years ago
Leif Åstrand
7abb5e3397
Don't provide details to teamcity as it nowadays gets those from stdout
Change-Id: I2c1e80307efaa963313bf89284066bc0429e9cd8
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
svn changeset:23229/svn branch:6.8
12 years ago
Johannes Dahlström
59826767eb
[merge from 6.7] fixes #8505
svn changeset:23227/svn branch:6.8
12 years ago
Artur Signell
67037e59a4
Abort if merge fails
svn changeset:22856/svn branch:6.8
12 years ago
Artur Signell
c8dbc25492
Optionally read password from file
svn changeset:22850/svn branch:6.8
12 years ago
Johannes Dahlström
e5b55ab465
merge.sh now works in directories other than /versions/, like merge-all.sh already does
svn changeset:22842/svn branch:6.8
12 years ago
Artur Signell
d472d9e143
User SVN_USER and SVN_PASS if given
svn changeset:22807/svn branch:6.8
12 years ago
Johannes Dahlström
f315689eff
Bugfix: concatenate merge commands properly
svn changeset:22804/svn branch:6.8
12 years ago
Artur Signell
af370437a9
Added exit codes
svn changeset:22800/svn branch:6.8
12 years ago
Artur Signell
f125516994
Added missing line
svn changeset:22786/svn branch:6.8
12 years ago
Artur Signell
f08f86caf9
Scripts for easing merge from 6.7
svn changeset:22783/svn branch:6.8
12 years ago