- /*
-
- If we want merge-forward changes to be subject to PR process, then this
- should useful. Currently using a simpler process based on
- toosl/scripts/merge-forward
-
- function doMergeForward($maintBranch, $devBranch) {
- if (!$maintBranch) {
- return $this->returnError("Missing <maintenace-base-branch>\n");
- }
- if (!$devBranch) {
- return $this->returnError("Missing <development-base-branch>\n");
- }
- list ($maintBranchRepo, $maintBranchName) = $this->parseBranchRepo($maintBranch);
- list ($devBranchRepo, $devBranchName) = $this->parseBranchRepo($devBranch);
-
- $newBranchRepo = $devBranchRepo;
- $newBranchName = $maintBranchName . '-' . $devBranchName . '-' . date('Y-m-d-H-i-s');
-
- if ($this->fetch) {
- $this->doFetchAll();
- }
-
- foreach ($this->repos as $repo => $relPath) {
- $filteredMaintBranch = $this->filterBranchName($repo, $maintBranch);
- $filteredDevBranch = $this->filterBranchName($repo, $devBranch);
- $filteredNewBranchName = $this->filterBranchName($repo, $newBranchName);
-
- $this->run($repo, $relPath, 'git', 'checkout', '-b', $filteredNewBranchName, $filteredDevBranch);
- $this->run($repo, $relPath, 'git', 'merge', $filteredMaintBranch);
- }
- }
- */
-