Merging changes from upstream code to a branch
AssigneeInternational Business Machines Corporation
InventorTakuya Nakaike
Life of this patent
Estimating the term…
Abstract
A computer-implemented method is provided for program repository management. The method includes identifying commits in an upstream commit log of an upstream branch and commits in a development commit log of a development branch. The method further includes extracting the commits in the development commit log of the development branch. The method also includes identifying, by a hardware processor in the upstream commit log, a code which is identical or similar to the extracted commits from the commit log of the development branch. The method additionally includes showing the identified code as a commit candidate of change in an upstream program code.
Claims18
A computer-implemented method for program repository management, the method comprising:
- identifying commits in an upstream commit log of an upstream branch and commits in a development commit log of a development branch;
- extracting the commits in the development commit log of the development branch;
- identifying, by a hardware processor in the upstream commit log, a code which is identical or similar to the extracted commits from the commit log of the development branch;
- showing the identified code as a commit candidate of change in an upstream program code;
- and
- wherein in said step of identifying the code, the code is similar to the extracted commits of the development branch when there exists at least one common instruction there between.
A computer program product for program repository management, the computer program product comprising a non-transitory computer readable storage medium having program instructions embodied therewith, the program instructions executable by a computer of the program repository management system to cause the computer to perform a method comprising:
- identifying commits in an upstream commit log of an upstream branch and commits in a development commit log of a development branch;
- extracting the commits in the development commit log of the development branch;
- identifying, by a hardware processor of the computer in the upstream commit log, a code which is identical or similar to the extracted commits from the commit log of the development branch;
- showing the identified code as a commit candidate of change in an upstream program code;
- and wherein in said step of identifying the code, the code is similar to the extracted commits of the development branch when there exists at least one common instruction there between.
A program repository management system, comprising:
- a memory device including program code stored thereon;
- a hardware processor, operatively coupled to the memory device, and configured to run the program code stored on the memory device to
- identify commits in an upstream commit log of an upstream branch and commits in a development commit log of a development branch;
- extract the commits in the development commit log of the development branch;
- identify, in the upstream commit log, a code which is identical or similar to the extracted commits from the commit log of the development branch;
- and
- show the identified code as a commit candidate of change in an upstream program code;
- and wherein in said step to identify the code, the code is similar to the extracted commits of the development branch when there exists at least one common instruction there between.
Dependencies are inferred from the claim text.