Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 50CD9200C5B for ; Thu, 27 Apr 2017 21:21:18 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4F701160BA7; Thu, 27 Apr 2017 19:21:18 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9726F160B9E for ; Thu, 27 Apr 2017 21:21:17 +0200 (CEST) Received: (qmail 64765 invoked by uid 500); 27 Apr 2017 19:21:16 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 64751 invoked by uid 99); 27 Apr 2017 19:21:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Apr 2017 19:21:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DD6C3DFC4A; Thu, 27 Apr 2017 19:21:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: filmaj@apache.org To: commits@cordova.apache.org Message-Id: <06c7eabccee545f683ebed2f723278fd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cordova-coho git commit: plugins releaser: when doing automatic merges from master into release branches, use the recursive merge strategy favouring the master branch. Warn the release manager about this too. Date: Thu, 27 Apr 2017 19:21:15 +0000 (UTC) archived-at: Thu, 27 Apr 2017 19:21:18 -0000 Repository: cordova-coho Updated Branches: refs/heads/master d9f7270e2 -> 468caf333 plugins releaser: when doing automatic merges from master into release branches, use the recursive merge strategy favouring the master branch. Warn the release manager about this too. Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/468caf33 Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/468caf33 Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/468caf33 Branch: refs/heads/master Commit: 468caf333d1dff207238061cc83d17c4136a07c6 Parents: d9f7270 Author: filmaj Authored: Thu Apr 27 12:21:10 2017 -0700 Committer: filmaj Committed: Thu Apr 27 12:21:10 2017 -0700 ---------------------------------------------------------------------- src/plugin-release.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/468caf33/src/plugin-release.js ---------------------------------------------------------------------- diff --git a/src/plugin-release.js b/src/plugin-release.js index fb24f4c..ba9f3f5 100644 --- a/src/plugin-release.js +++ b/src/plugin-release.js @@ -521,7 +521,7 @@ function *interactive_plugins_release() { prompts.push({ type: 'confirm', name: 'rb_automerge_proceed_' + plugin_name, - message: plugin_name + ' already has an existing release branch "' + rb + '". Do you want me to automatically merge master into this branch for you? If no, I will prompt you to modify the release branch yourself at a later time in this session.' + message: plugin_name + ' already has an existing release branch "' + rb + '". Do you want me to automatically merge master into this branch for you? If no, I will prompt you to modify the release branch yourself at a later time in this session.\nWARNING: this will run `git merge master -s recursive -X theirs` from the release branch, essentially favouring master branch changes. Only proceed with the auto-merge if you understand the repercussions of doing so.' }); }); return inquirer.prompt(prompts); @@ -535,10 +535,10 @@ function *interactive_plugins_release() { var rb = versionutil.getReleaseBranchNameFromVersion(plugin_data[plugin_name].current_release); console.log('Checking out "' + rb + '" branch of', plugin_name, 'merging master in...'); yield gitutil.gitCheckout(rb); - //yield executil.execHelper(executil.ARGS('git merge -s recursive -X theirs', 'master'), false, false, function() { - // console.log('Merge was fine, continuing.'); - //}, function(e) { - yield gitutil.merge('master', function() { console.log('merge was fine, continuing.'); }, function(e) { + yield executil.execHelper(executil.ARGS('git merge -s recursive -X theirs', 'master'), false, false, function() { + console.log('Merge was fine, continuing.'); + }, function(e) { + //yield gitutil.merge('master', function() { console.log('merge was fine, continuing.'); }, function(e) { plugins_to_merge_manually.push(plugin_name); }); } else { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org