Code synchronizing method and apparatus

A synchronization device and code technology, applied in the direction of program control devices, etc., can solve the problems of low manual operation efficiency, achieve the effect of improving version release efficiency and reducing manual operation costs

Active Publication Date: 2016-02-03
TENCENT TECH (SHENZHEN) CO LTD
View PDF3 Cites 25 Cited by
  • Summary
  • Abstract
  • Description
  • Claims
  • Application Information

AI Technical Summary

Problems solved by technology

[0012] Embodiments of the present invention provide a code synchronization method and device, to at least solve the technical problem of low efficiency caused by manual operation required for the synchronization of main code and branch code in the prior art

Method used

the structure of the environmentally friendly knitted fabric provided by the present invention; figure 2 Flow chart of the yarn wrapping machine for environmentally friendly knitted fabrics and storage devices; image 3 Is the parameter map of the yarn covering machine
View more

Image

Smart Image Click on the blue labels to locate them in the text.
Viewing Examples
Smart Image
  • Code synchronizing method and apparatus
  • Code synchronizing method and apparatus
  • Code synchronizing method and apparatus

Examples

Experimental program
Comparison scheme
Effect test

Embodiment 1

[0037] According to the embodiment of the present invention, a method embodiment that can be executed by the device embodiment of the present application is provided. It should be noted that the steps shown in the flow chart of the accompanying drawings can be implemented in a computer system such as a set of computer-executable instructions and, although a logical order is shown in the flowcharts, in some cases the steps shown or described may be performed in an order different from that shown or described herein.

[0038] According to an embodiment of the present invention, a code synchronization method is provided, figure 2 is a flowchart of a code synchronization method according to an embodiment of the present invention, such as figure 2 As shown, the code synchronization method includes the following steps S202 to S208:

[0039] S202: Obtain the synchronization parameters of the target branch, wherein the target branch is a branch for editing the branch code, and the ...

Embodiment 2

[0067] According to the embodiment of the present invention, there is also provided a code synchronization device for implementing the above code synchronization method, the code synchronization device is mainly used to execute the code synchronization method provided in the above content of the embodiment of the present invention, the following describes the embodiment of the present invention The provided code synchronization device is introduced in detail:

[0068] Figure 4 is a schematic diagram of a code synchronization device according to an embodiment of the present invention, such as Figure 4 As shown, the code synchronization device mainly includes a first acquisition unit 10, a second acquisition unit 20, a third acquisition unit 30 and a synchronization unit 40, wherein:

[0069] The first obtaining unit 10 is used to obtain the synchronization parameters of the target branch, wherein the target branch is a branch for editing the branch code, and the target branc...

Embodiment 3

[0083] According to an embodiment of the present invention, there is also provided a terminal device for implementing the above code synchronization method, the terminal device includes a processor performing the following operations:

[0084] Obtain the synchronization parameters of the target branch, where the target branch is the branch for editing the branch code, and the target branch has pre-configured synchronization parameters; obtain the conflict handling method from the synchronization parameters, and obtain the trunk according to the branch attributes and synchronization parameters of the target branch Synchronization range; obtain the branch code on the target branch; and synchronize the trunk code within the trunk synchronization range to the branch code, and handle conflicts in the synchronization process according to the conflict handling method.

[0085] Query the start revision number of the trunk synchronization range from the branch properties; query the end ...

the structure of the environmentally friendly knitted fabric provided by the present invention; figure 2 Flow chart of the yarn wrapping machine for environmentally friendly knitted fabrics and storage devices; image 3 Is the parameter map of the yarn covering machine
Login to view more

PUM

No PUM Login to view more

Abstract

The invention discloses a code synchronizing method and apparatus. The code synchronizing method comprises: obtaining a synchronizing parameter of a target branch, wherein the target branch is a branch for editing a branch code, and has a pre-configured synchronizing parameter; obtaining a conflict processing mode from the synchronizing parameter, and obtaining a trunk synchronizing range according to branch attributes and the synchronizing parameter of the target branch; obtaining the branch code on the target branch; and synchronizing a trunk code in the trunk synchronizing range to the branch code, and processing conflicts during the synchronizing process in the conflict processing mode. Through the code synchronizing method and apparatus, the technical problem of low efficiency caused by a manual operation for synchronizing a trunk code and a branch code in the prior art is solved, so that the technical effects of reducing manual operation costs and improving version release efficiency are achieved.

Description

technical field [0001] The invention relates to the field of software engineering, in particular to a code synchronization method and device. Background technique [0002] Currently, in the branch development mode, developers usually manually synchronize the code update on the trunk to the branch. Taking the SVN version control tool to maintain the project as an example, the main process of synchronizing the trunk and the branch is figure 1 shown in the figure 1 As shown, the specific process is as follows: [0003] 1) Check out (that is, checkout) the branch code from the server to the local; [0004] 2) Select the revision number (that is, revision number) of the specified range on the trunk, merge the checked-out branch code into the trunk, and realize the change content on the branch of the trunk code synchronization. Among them, start: is generally the revision number when the branch was initially created, or the revision number of the trunk at the time of the latest...

Claims

the structure of the environmentally friendly knitted fabric provided by the present invention; figure 2 Flow chart of the yarn wrapping machine for environmentally friendly knitted fabrics and storage devices; image 3 Is the parameter map of the yarn covering machine
Login to view more

Application Information

Patent Timeline
no application Login to view more
Patent Type & Authority Applications(China)
IPC IPC(8): G06F9/44
Inventor 陈莹蔡智博李赟
Owner TENCENT TECH (SHENZHEN) CO LTD
Who we serve
  • R&D Engineer
  • R&D Manager
  • IP Professional
Why Eureka
  • Industry Leading Data Capabilities
  • Powerful AI technology
  • Patent DNA Extraction
Social media
Try Eureka
PatSnap group products

Browse by: Latest US Patents, China's latest patents, Technical Efficacy Thesaurus, Application Domain, Technology Topic.

© 2024 PatSnap. All rights reserved.Legal|Privacy policy|Modern Slavery Act Transparency Statement|Sitemap