Ordering commits of code in multi-branch parallel development projects
AssigneeSprint Communications Company L.P.
InventorJawahar Antao
Life of this patent
Estimating the term…
Abstract
A method of merging commits of code in a parallel code base environment. The method comprises receiving a plurality of tickets from a ticket data store by a commit merge application executing on a computer system, wherein each ticket comprises at least one commit comprising a commit identifier and a timestamp, extracting the at least one commit identifier from each of the plurality of tickets, and ordering the extracted commit identifiers from earliest to most recently committed based on the timestamp. Based on the ordering, the method further comprises merging the commits of the test code branch with a master code branch, identifying conflicts between the commits of the test code branch with the master code branch, and resolving any identified conflicts to a later commit.
Claims20
A method of merging commits of code in a parallel code base environment, comprising:
- receiving a plurality of tickets from a ticket data store by a commit merge application executing on a computer system, wherein each ticket comprises at least one commit identifier and timestamp associated with a commit made to a test code branch;
- extracting the at least one commit identifier from each of the plurality of tickets by the commit merge application;
- ordering the extracted commit identifiers from earliest to most recently committed based on timestamps by the commit merge application;
- based on the ordering, merging the commits identified by the ordered list of extracted commit identifiers of the test code branch with a master code branch by the commit merge application;
- identifying conflicts between the commits identified by the ordered list of extracted commit identifiers of the test code branch with the master code branch by the commit merge application;
- and
- resolving any identified conflicts to a later commit by the commit merge application.
A method of merging commits of code in a parallel code base environment, comprising:
- analyzing a test code branch and a master code branch for commits by a commit merge application executing on a computer system;
- recording each of the commits of the test code branch and the master code branch by the commit merge application, wherein each of the commits is associated with a commit identifier and a timestamp;
- ordering the commit identifiers of the test code branch from earliest to most recently committed based on timestamps by the commit merge application;
- ordering the commit identifiers of the master code branch from earliest to most recently committed based on timestamps by the commit merge application;
- interleaving the commit identifiers of the ordered commit identifiers of the test code branch and the master code branch based on timestamps by the commit merge application;
- merging the commits identified by the interleaved commit identifiers by the commit merge application;
- identifying a first set of conflicts of the commit identifiers of the test code branch by the commit merge application;
- identifying a second set of conflicts of the commit identifiers of the master code branch by the commit merge application;
- and
- resolving the first and second set of identified conflicts to a later commit by the commit merge application.
A method of ordering commits of code in a multi-branch code base environment, comprising:
- requesting an ordered list of commit identifiers of a test code branch from a commit data store by a commit merge application executing on a computer system, wherein each commit identifier is associated with a timestamp and a commit made to the test branch;
- receiving the ordered list of commit identifiers by the commit merge application, wherein the list of commit identifiers is ordered from earliest to most recently committed based on timestamps;
- receiving a plurality of tickets from a ticket data store by the commit merge application, wherein each ticket comprises at least one commit identifier and timestamp associated with a commit made to the test code branch;
- extracting the at least one commit identifier from each of the plurality of tickets by the commit merge application, wherein at least some commit identifiers of the ordered list of commit identifiers overlap with a commit identifier of the extracted commit identifiers;
- eliminating one or more commit identifiers from the ordered list of commit identifiers that do not overlap with any of the commit identifiers of the extracted commit identifiers;
- creating a list of final commit identifiers comprising the remaining commit identifiers from the ordered list of commit identifiers by the commit merge application, wherein the commit identifiers of the list of final commit identifiers are recorded based on the sequence of the ordered list of commit identifiers;
- and
- merging the commits associated with the commit identifiers of the list of final commit identifiers to the master code branch by the commit merge application.
Dependencies are inferred from the claim text.