Leif Åstrand
d09b586ece
Don't start merging if there are uncommitted changes
...
Change-Id: Ic1211e914162be6910caae10fcfc7deebc5b4ad3
2013-05-06 14:54:41 +03:00
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
2013-05-06 14:43:48 +03:00
Artur Signell
5a5066a8c3
Include commit id and message in merge commit message
...
Change-Id: I2557eddcb4fbd4fd1ec5c608a0d73c7fa1b243b6
2013-04-23 13:38:13 +00:00
Artur Signell
33e114bd3b
Ensure no-op merges get a change id
...
Change-Id: Icda1db985b3a0654fa1274e700cddfe2f990df12
2013-04-23 12:38:15 +00:00
Artur Signell
0f3ac51ed4
Merge commit '6922bc5b49c5551b289a5025ccd5901e2ac3aafc'
...
Change-Id: Id118fd9bae1fdf7e7ce2efd660ade5ba7bbc5109
2013-03-12 12:58:07 +02:00
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
2013-03-12 12:56:53 +02:00
Leif Åstrand
7abb5e3397
Don't provide details to teamcity as it nowadays gets those from stdout
...
Change-Id: I2c1e80307efaa963313bf89284066bc0429e9cd8
2013-03-06 13:10:04 +02:00
Leif Åstrand
72a1641a0b
Fix merge checker issues
2012-10-19 15:26:14 +03:00
Leif Åstrand
2a60b68954
Fix copy/paste error in teamcity integration
2012-07-24 15:00:31 +03:00
Leif Åstrand
76bfc960d3
Adjust merge check to work more nicely with team city
2012-07-24 14:56:25 +03:00
Leif Åstrand
d0cf1686b2
Add script for automatically checking for unmerged commits
2012-07-24 11:38:23 +03:00
Artur Signell
67037e59a4
Abort if merge fails
...
svn changeset:22856/svn branch:6.8
2012-02-02 10:15:50 +00:00
Artur Signell
c8dbc25492
Optionally read password from file
...
svn changeset:22850/svn branch:6.8
2012-02-02 08:22:32 +00:00
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
2012-01-31 12:28:39 +00:00
Artur Signell
d472d9e143
User SVN_USER and SVN_PASS if given
...
svn changeset:22807/svn branch:6.8
2012-01-27 16:36:36 +00:00
Johannes Dahlström
f315689eff
Bugfix: concatenate merge commands properly
...
svn changeset:22804/svn branch:6.8
2012-01-27 16:26:09 +00:00
Artur Signell
af370437a9
Added exit codes
...
svn changeset:22800/svn branch:6.8
2012-01-27 14:36:26 +00:00
Artur Signell
f125516994
Added missing line
...
svn changeset:22786/svn branch:6.8
2012-01-27 12:58:35 +00:00
Artur Signell
f08f86caf9
Scripts for easing merge from 6.7
...
svn changeset:22783/svn branch:6.8
2012-01-27 08:28:24 +00:00
