Commit Graph

31 Commits

Author SHA1 Message Date
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
2014-05-05 12:20:59 +00:00
Artur Signell
6c022639ad Merge from 7.1 to 7.2
Merge: no
Change-Id: Ibfe17c35ec72985823389c75a5c3135998443068
2014-04-16 11:43:59 +03:00
Artur Signell
34029194d6 Merge from 7.2
Change-Id: Ic52a0be061bf22058ac9b831f3e965547a1b8933
2014-04-11 08:40:15 +03:00
Artur Signell
3be4326317 Email author about merge failures
Change-Id: I58554c9095e815087bee321dfc57e9e45b5b0481
2014-02-26 20:00:39 +00:00
Artur Signell
bb2a440037 Use different exit codes for different errors
Change-Id: I7e5bba7f290ec9e6c482231bde3c12d13a3a80ea
2014-02-25 12:25:04 +02:00
Leif Åstrand
31a3f4fccb Fix typo in automerge script
Change-Id: I41ca4f5cd21b85ead3ae2888d5c1b94cb40f1bd8
2013-10-04 12:02:13 +03:00
Leif Åstrand
fe8d330c3c Escape \ in commit messages
Change-Id: I1c5773dd593d7877833a5b1798f3e812b53a1b1e
2013-06-07 14:03:50 +03:00
Leif Åstrand
8d1ccd76be Ignore changes merged from the previous maintenance branch
Change-Id: I16a203db76fd6dc7e091a2b2708f80b9d4cef079
2013-06-07 12:32:13 +03:00
Leif Åstrand
20b169873d Merge changes from origin/7.1
145a3e3 Send browser window resizes if there is a listener (#10055)
609acd1 Fixed table height rendering in Android 2.3 #11331
3dd6b44 Show tooltip on focus for DataField for AT (#11865)
4235382 Add ARIA presentation role to FormLayout (#11866)
f1130fa Reset focus after selection from ContextMenu (#11476)
fa0c9f5 Allow to close a context menu with ESC key (#11869)
656eaa5 Tweak TooltipConfiguration test to pass in IE9 and IE10
63dd611 Centers VOverlays in visual viewport on iOS, Android, fixes #11614
5a33d7d Test for #11775
0c8edf1 Avoid marking AbstractField dirty in primitive getters (#11201)
6c64757 Remove JavaDoc dependency to vaadin-server from PageState (#11873)
2f6d5e0 Tooltip accessibility fixes (#11799)
9b6b735 Merge changes from origin/7.0
1205e87 Merge commit 'a52ceb96590333' into 7.1
5a93038 Commit and push everything before a conflicting commit
73a50db Merge changes from origin/7.0

Change-Id: I63b89036a5973ca4ce14a6b3347f15c548e96169
2013-05-17 16:45:25 +03:00
Leif Åstrand
5a9303869c Commit and push everything before a conflicting commit
Change-Id: Ifdc45e2b0f540ac8212aaca835b9d11c18078eb5
2013-05-17 12:54:46 +00:00
Leif Åstrand
3f21afac93 Merge changes from origin/7.1
7d9f544 Test for #11396 (merged from 6.8 branch). Depends on a blur event so cannot be autotested with TB.
d09b586 Don't start merging if there are uncommitted changes
5388dce Fixed IllegalSyntaxException when using spaces in path #11782
96b6250 Form field and layout Aria corrections (#11785)
9bd7c2b Fixed order of tests in LayoutTesterApplication #11796
f2c2236 Replaced css inject hack in TestUtils with Page.Styles.add() #11798
571792e Remove old widget hierarchy hack that caused problems (#11752)
1b18807 Remove pre-loader element after pre-loading, fixes #10863
e285119 Move .v-assistive-device-only out of @mixin base-common
762c924 Update test to work with the new debug window
ce9c818 Instead of applying workaround to the root panel, apply it to the sub window content element instead to prevent scrolling of the document when a sub window is removed. #11713 (#10776)
3f5d022 Liferay 6.2 compatibility (#11751)
ffd1c1b Don't ignore child component margins in AbstractOrderedLayout (#11553)
62ae5e1 More verbose output from running Jetty
21d9b67 Add a large number of debug calls to VFilterSelect (disabled by default)
bdb7931 Merge test for #11623 to 7.0.
19e27a1 Move suggestion popup width calculation from connector to VFilterSelect
42d9476 Merge changes from origin/7.0

Change-Id: I2c02268adcb7c81bd7f0c465be152c1d88293532
2013-05-10 17:02:48 +03:00
Leif Åstrand
cc995bbe0f Update merge specification for the master branch.
Change-Id: Ia8ad2d2e44e2d29bfa9e2271e4e4cad0a672ec22
2013-05-07 09:21:10 +03:00
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