commit fccedbc554f60b6a8ec09d3e81f8dd7968327fb0
author Paladox none <thomasmulhall410@yahoo.com> Mon Sep 16 13:17:34 2019 +0000
committer Paladox none <thomasmulhall410@yahoo.com> Tue Sep 17 15:45:21 2019 +0000
tree 2030ba83ff38ab491398110994ffdafd840996f4
parent 0ecc8f465956b80bbf2d6c52f263cf2d7d981c31

Fix using "Default Base For Merges"

Change-Id: I5c07906e1c6f69fc966f1d25a35beaaf81e05ecc

polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js

diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
index fface9d..301bdbd 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
@@ -890,12 +890,15 @@
     _changeChanged(change) {
       if (!change || !this._patchRange || !this._allPatchSets) { return; }
 
-      // Update patchNum before getting basePatchNum.
+      // We get the parent first so we keep the original value for basePatchNum
+      // and not the updated value.
+      const parent = this._getBasePatchNum(change, this._patchRange);
+
       this.set('_patchRange.patchNum', this._patchRange.patchNum ||
               this.computeLatestPatchNum(this._allPatchSets));
 
-      const parent = this._getBasePatchNum(change, this._patchRange);
       this.set('_patchRange.basePatchNum', parent);
+
       const title = change.subject + ' (' + change.change_id.substr(0, 9) + ')';
       this.fire('title-change', {title});
     },