Synchronizing branches of computer program source code

Patent metadata

Field	Value
Publication number	US-9575764-B1
Application number	US-201414210811-A
Country	US
Kind code	B1
Filing date	Mar 14, 2014
Priority date	Mar 15, 2013
Publication date	Feb 21, 2017
Grant date	Feb 21, 2017

Abstract

In an embodiment, a data processing system comprises one or more processors; one or more non-transitory computer-readable storage media storing sequences of instructions which, when executed by the one or more processors, cause the processor to perform determining whether first computer program source code that is associated with an upstream repository comprises a revision that is absent from second computer program source code that is associated with a fork of the first computer program source code, wherein the first source code comprises a first branch and the second source code comprises a second branch, and wherein the first branch corresponds to the second branch; determining whether the second branch in the second source code comprises a second revision that is absent from a corresponding first branch in the first source code, in response to a determination that the first source code comprises the revision that is absent from the second source code; causing outputting to a computer display device an option to synchronize the second branch of the second source code with the corresponding first branch in the first source code in response to determining that the second branch of the second source code comprises the second revision that is absent from the corresponding first branch in the first source code; receiving a selection of the option; in response to the selection of the option, automatically synchronizing the second branch in the second source code with the first branch in the first source code.

First claim

What is claimed is:

1. A data processing system comprising:
one or more processors;
one or more non-transitory computer-readable storage media storing sequences of instructions which, when executed by the one or more processors, cause the one or more processors to perform:
determining whether first content that is associated with an upstream repository comprises a revision that is absent from second content that is associated with a fork of the first content, wherein the first content comprises a first branch and the second content comprises a second branch, and wherein the first branch corresponds to the second branch;
determining whether the second branch in the second content comprises a second revision that is absent from the first branch in the first content, in response to a determination that the first content comprises the revision that is absent from the second content;
in response to determining that the second branch of the second content comprises no revision that is absent from the first branch, synchronizing changes to the first branch from the upstream repository to the second branch, without user intervention;
in response to determining that the second branch of the second content comprises the second revision that is absent from the first branch in the first content:
causing outputting to a computer display device an option to synchronize the second branch of the second content with the first branch in the first content;
receiving a selection of the option;
in response to the selection of the option, synchronizing the second branch in the second content with the first branch in the first content without user intervention.

2. The system of claim 1 , comprising instructions which when executed cause outputting a second option specifying merging the second branch of the second content, which comprises the second revision, with the first branch of the first content, which includes a third revision, to create a revised branch in the second content that includes the second revision and the third revision;
in response to selection of the second option, automatically merging the second branch of the second content, which comprises the second revision, with the first branch of the first content, which includes the third revision, to create the revised branch in the second content that includes the second revision and the third revision.

3. The system of claim 1 , further comprising sequences of instructions which, when executed by the one or more processors, cause the one or more processors to perform:
causing outputting to a computer display device an option to perform at least one of saving the second revision to a new branch in the second content, and bringing commit objects from the first branch into the second branch;
receiving a selection of the option;
performing, in response to the selection, at least one of saving the second revision to a new branch in the second content, and bringing commit objects from the first branch into the second branch.

4. The system of claim 1 , further comprising sequences of instructions which, when executed by the one or more processors, cause the one or more processors to perform:
causing outputting to a computer display device an option to perform saving the second revision to a new branch in the second content;
receiving a selection of the option;
in response to the selection, saving the second revision to a new branch in the second content.

5. The system of claim 1 wherein the first content and second content comprise computer program source code.

6. A data processing method, comprising:
determining whether first content that is associated with an upstream repository comprises a revision that is absent from second content that is associated with a fork of the first content, wherein the first content comprises a first branch and the second content comprises a second branch, and wherein the first branch corresponds to the second branch;
determining whether the second branch in the second content comprises a second revision that is absent from the first branch in the first content, in response to a determination that the first content comprises the revision that is absent from the second content;
in response to determining that the second branch in the second content comprises no revision that is absent from the first branch, synchronizing changes to the first branch from the upstream repository to the second branch, without user intervention;
in response to determining that the second branch of the second content comprises the second revision that is absent from the first branch in the first content:
causing outputting to a computer display device an option to synchronize the second branch of the second content with the first branch in the first content;
receiving a selection of the option;
in response to the selection of the option, synchronizing the second branch in the second content with the first branch in the first content without user intervention;
wherein the method is performed using one or more computing devices.

7. The method of claim 6 , further comprising:
outputting a second option specifying merging the second branch of the second content, which comprises the second revision, with the first branch of the first content, which includes a third revision, to create a revised branch in the second content that includes the second revision and the third revision;
in response to selection of the second option, automatically merging the second branch of the second content, which comprises the second revision, with the first branch of the first content, which includes the third revision, to create the revised branch in the second content that includes the second revision and the third revision.

8. The method of claim 6 , further comprising:
causing outputting to a computer display device an option to perform at least one of saving the second revision to a new branch in the second content, and bringing commit objects from the first branch into the second branch;
receiving a selection of the option;
performing, in response to the selection, at least one of saving the second revision to a new branch in the second content, and bringing commit objects from the first branch into the second branch.

9. The method of claim 6 , further comprising:
causing outputting to a computer display device an option to perform saving the second revision to a new branch in the second content;
receiving a selection of the option;
performing, in response to the selection, saving the second revision to a new branch in the second content.

10. The method of claim 6 , wherein the first content and second content comprise computer program source code.

11. A data processing method comprising:
using a server computer, obtaining from one or more non-transitory computer-readable data storage media a copy of one or more sequences of instructions that are stored on the media and which when executed using a particular user computer among a plurality of user computers cause performing, using the particular user computer alone or in combination with the server computer:
determining whether first content that is associated with an upstream repository comprises a revision that is absent from second content that is associated with a fork of the first content, wherein the first content comprises a first branch and the second content comprises a second branch, and wherein the first branch corresponds to the second branch;
determining whether the second branch in the second content comprises a second revision that is absent from the first branch in the first content, in response to a determination that the first content comprises the revision t

Assignees

• Atlassian Pty Ltd

Inventors

• Turner Bryan Paul
• Tjhin Xu-Heng
• Rao Brodie Glen

Classifications

• G06F8/71 Primary

  Version control (security arrangements therefor G06F21/57); Configuration management · CPC title

• G06F9/3844 Primary

  using dynamic branch prediction, e.g. using branch history tables · CPC title

• G06F3/14

  Digital output to display device {; Cooperation and interconnection of the display device with other functional units} · CPC title

• G06F3/016

  Input arrangements with force or tactile feedback as computer generated output to the user · CPC title