sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-18 00:03:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

release.pl: stay on same master* branch

Browse Source 
(cherry picked from commit cc429785edd16a91f7118cb7a1b964492988546f)
This commit is contained in:
Juergen E. Fischer 2016-10-21 14:08:06 +02:00
parent a51bebdacc
commit 2cb6982113
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/release.pl
View File

@ -207,7 +207,7 @@ unless( $dopoint ) {
$newminor++; $newminor++;
print "Updating master...\n"; print "Updating master...\n";
run( "git checkout master", "checkout master failed" ); run( "git checkout $branch", "checkout master failed" );
if($dopremajor) { if($dopremajor) {
print " Creating master_$newmajor...\n"; print " Creating master_$newmajor...\n";
@ -230,7 +230,7 @@ unless( $dopoint ) {
run( "dch --newversion $newmajor.$newminor.0 'New development version $newmajor.$newminor after branch of $release'", "dch failed" ); run( "dch --newversion $newmajor.$newminor.0 'New development version $newmajor.$newminor after branch of $release'", "dch failed" );
run( "git commit -a -m 'Bump version to $newmajor.$newminor'", "bump version failed" ); run( "git commit -a -m 'Bump version to $newmajor.$newminor'", "bump version failed" );
push @topush, "master"; push @topush, $branch;
} }
push @topush, $relbranch; push @topush, $relbranch;