beachball
Advanced tools
Comparing version 1.11.4 to 1.11.5
@@ -5,3 +5,17 @@ { | ||
{ | ||
"date": "Sat, 03 Aug 2019 03:59:08 GMT", | ||
"date": "Sat, 03 Aug 2019 04:05:26 GMT", | ||
"tag": "beachball_v1.11.5", | ||
"version": "1.11.5", | ||
"comments": { | ||
"patch": [ | ||
{ | ||
"comment": "change format of the error message a tiny bit", | ||
"author": "kchau@microsoft.com", | ||
"commit": "3c6c1bb8122eaa94a3c536b0bca371eac14d5c93" | ||
} | ||
] | ||
} | ||
}, | ||
{ | ||
"date": "Sat, 03 Aug 2019 03:59:51 GMT", | ||
"tag": "beachball_v1.11.4", | ||
@@ -8,0 +22,0 @@ "version": "1.11.4", |
# Change Log - beachball | ||
This log was last generated on Sat, 03 Aug 2019 03:59:08 GMT and should not be manually modified. | ||
This log was last generated on Sat, 03 Aug 2019 04:05:26 GMT and should not be manually modified. | ||
## 1.11.5 | ||
Sat, 03 Aug 2019 04:05:26 GMT | ||
### Patches | ||
- change format of the error message a tiny bit (kchau@microsoft.com) | ||
## 1.11.4 | ||
Sat, 03 Aug 2019 03:59:08 GMT | ||
Sat, 03 Aug 2019 03:59:51 GMT | ||
@@ -8,0 +15,0 @@ ### Patches |
@@ -137,3 +137,3 @@ "use strict"; | ||
['commit', '-m', message], | ||
['checasdfkout', branch], | ||
['checkout', branch], | ||
['merge', '-X', 'ours', publishBranch], | ||
@@ -146,3 +146,3 @@ ['branch', '-D', publishBranch] | ||
if (!result.success) { | ||
console.error(`[mergePublishBranch (${index + 1} / ${mergeSteps.length})] trying to run "git ${step.join(' ')}"`); | ||
console.error(`mergePublishBranch (${index + 1} / ${mergeSteps.length}) - trying to run "git ${step.join(' ')}"`); | ||
console.error(result.stdout && result.stdout.toString().trim()); | ||
@@ -149,0 +149,0 @@ console.error(result.stderr && result.stderr.toString().trim()); |
{ | ||
"name": "beachball", | ||
"version": "1.11.4", | ||
"version": "1.11.5", | ||
"main": "index.js", | ||
@@ -5,0 +5,0 @@ "license": "MIT", |
@@ -149,3 +149,3 @@ import { bump, BumpInfo } from './bump'; | ||
if (!result.success) { | ||
console.error(`[mergePublishBranch (${index + 1} / ${mergeSteps.length})] trying to run "git ${step.join(' ')}"`); | ||
console.error(`mergePublishBranch (${index + 1} / ${mergeSteps.length}) - trying to run "git ${step.join(' ')}"`); | ||
console.error(result.stdout && result.stdout.toString().trim()); | ||
@@ -152,0 +152,0 @@ console.error(result.stderr && result.stderr.toString().trim()); |
114592
2772