Demon has submitted this change and it was merged.
Change subject: Update .gitreview and version number before doing patches
......................................................................
Update .gitreview and version number before doing patches
Cause if patches conflict, stuff breaks and you don't know it hasn't happened
Change-Id: I439b212ead1eec7981f2a5c6b88bf6c7ce235f95
---
M make-wmf-branch/make-wmf-branch
1 file changed, 5 insertions(+), 6 deletions(-)
Approvals:
Demon: Verified; Looks good to me, approved
diff --git a/make-wmf-branch/make-wmf-branch b/make-wmf-branch/make-wmf-branch
index d368580..38b6296 100755
--- a/make-wmf-branch/make-wmf-branch
+++ b/make-wmf-branch/make-wmf-branch
@@ -179,6 +179,11 @@
$this->chdir( "../.." );
}
}
+ # Fix $wgVersion
+ $this->fixVersion( "includes/DefaultSettings.php" );
+
+ # Point gitreview defaultbranch at wmf/version
+ $this->fixGitReview();
# Do intermediate commit
$this->runCmd( 'git', 'commit', '-a', '-q', '-m', "Creating new
WMF {$this->newVersion} branch" );
@@ -189,12 +194,6 @@
$this->runCmd( 'git', 'fetch', $this->baseRepoPath .
'/' . $subpath, $patch );
$this->runCmd( 'git', 'cherry-pick', 'FETCH_HEAD' );
}
-
- # Fix $wgVersion
- $this->fixVersion( "includes/DefaultSettings.php" );
-
- # Point gitreview defaultbranch at wmf/version
- $this->fixGitReview();
# Do the final commit
$this->runCmd( 'git', 'commit', '-a', '-q', '-m',
--
To view, visit https://gerrit.wikimedia.org/r/61484
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I439b212ead1eec7981f2a5c6b88bf6c7ce235f95
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Demon <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
