cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fil...@apache.org
Subject [33/35] cordova-coho git commit: CB-12536: make sure to update the release branch if it is detected to already exist for a given plugin to be released.
Date Wed, 26 Apr 2017 01:04:28 GMT
CB-12536: make sure to update the release branch if it is detected to already exist for a given
plugin to be released.


Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/0917abe3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/0917abe3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/0917abe3

Branch: refs/heads/master
Commit: 0917abe352f1fd7ae3b8b1743d7ed9eb3a8babc6
Parents: 056c0df
Author: filmaj <maj.fil@gmail.com>
Authored: Fri Mar 3 20:18:14 2017 -0800
Committer: filmaj <maj.fil@gmail.com>
Committed: Tue Apr 25 17:28:09 2017 -0700

----------------------------------------------------------------------
 src/plugin-release.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/0917abe3/src/plugin-release.js
----------------------------------------------------------------------
diff --git a/src/plugin-release.js b/src/plugin-release.js
index 9a996f8..35207eb 100644
--- a/src/plugin-release.js
+++ b/src/plugin-release.js
@@ -487,7 +487,8 @@ function *interactive_plugins_release() {
                         repos_with_existing_release_branch.push(repo);
                         // also store HEAD of release branch, so later on we can show a diff
of the branch before pushing
                         plugin_data[plugin_name].previous_release_branch_head = gitutil.hashForRef(release_branch_name);
-                        console.log('Release branch', release_branch_name, 'already exists
- we will be making changes to this existing branch.');
+                        console.log('Release branch', release_branch_name, 'already exists,
time to update it. We will be making changes to this existing branch.');
+                        yield repoupdate.updateRepos([repo], [release_branch_name], /*noFetch*/false);
                     } else {
                         yield gitutil.createNewBranch(release_branch_name);
                         console.log('Created branch', release_branch_name, 'in repo', plugin_name);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message