You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2017/04/27 19:21:15 UTC
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.
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 <ma...@gmail.com>
Authored: Thu Apr 27 12:21:10 2017 -0700
Committer: filmaj <ma...@gmail.com>
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