CN109358898B - Information processing method and device, electronic equipment and storage medium - Google Patents
Information processing method and device, electronic equipment and storage mediumDownload PDFInfo
- Publication number
- CN109358898B CN109358898BCN201811246909.XACN201811246909ACN109358898BCN 109358898 BCN109358898 BCN 109358898BCN 201811246909 ACN201811246909 ACN 201811246909ACN 109358898 BCN109358898 BCN 109358898B
- Authority
- CN
- China
- Prior art keywords
- information
- version
- target
- path information
- merging
- Prior art date
- Legal status (The legal status is an assumption and is not a legal conclusion. Google has not performed a legal analysis and makes no representation as to the accuracy of the status listed.)
- Active
Links
Images
Classifications
- G—PHYSICS
- G06—COMPUTING OR CALCULATING; COUNTING
- G06F—ELECTRIC DIGITAL DATA PROCESSING
- G06F8/00—Arrangements for software engineering
- G06F8/70—Software maintenance or management
- G06F8/71—Version control; Configuration management
Landscapes
- Engineering & Computer Science (AREA)
- Software Systems (AREA)
- General Engineering & Computer Science (AREA)
- Theoretical Computer Science (AREA)
- Computer Security & Cryptography (AREA)
- Physics & Mathematics (AREA)
- General Physics & Mathematics (AREA)
- Stored Programmes (AREA)
- Navigation (AREA)
Abstract
Description
Technical Field
The present invention relates to the field of information technology, and in particular, to an information processing method, an information processing apparatus, an electronic device, and a storage medium.
Background
During the development of a project (for example, the development of a software program), multiple project participants may need to complete the development together, meanwhile, multiple project versions may be involved in the development process, and processing may be performed on different versions of the project.
The SVN is a abbreviation of Subversion, and is a commonly used version control system, different versions can be merged in the SVN to generate a new version, and different versions are generally provided with different version numbers. However, in the SVN, when different versions are merged, the version number is generally manually input, and there is no verification process for inputting the version number. Subsequent developers can only compare the logs of the version control system and compare a plurality of pieces of information, so that the subsequent developers can know accurately which previous versions are combined to form the current version, and the subsequent developers are greatly unchanged, and the work efficiency of project development is seriously influenced.
Disclosure of Invention
In view of the above problems, embodiments of the present invention are proposed to provide an information processing method, apparatus, electronic device, and storage medium that overcome or at least partially solve the above problems.
In order to solve the above problem, an embodiment of the present invention discloses an information processing method, where the method includes:
acquiring target path information;
acquiring current version information corresponding to the target path information and historical version information;
and determining the version merging relationship between the current version information and the historical version information according to the difference between the current version information and the historical version information.
Preferably, the step of obtaining the target path information includes:
acquiring root directory information;
traversing the root directory information to acquire first key-value pair data containing merging characteristic information;
and extracting target path information in the first key-value pair data.
Preferably, the step of obtaining the current version information corresponding to the target path information and the historical version information includes:
traversing the target path information to obtain log information corresponding to the target path information; the log information records a current version number corresponding to the target path information and a historical version number before the current version number;
acquiring current version information corresponding to the current version number;
and acquiring historical version information corresponding to the historical version number.
Preferably, the current version information includes first source path information, a first merging version number corresponding to the first source path information; the historical version number information comprises the second source path information and a second combined version number corresponding to the second source path information; the step of determining the version merging relationship between the current version information and the historical version information according to the difference between the current version information and the historical version information includes:
determining target source path information and a target merging version number corresponding to the target source path information according to the difference between the first source path information and the second source path information;
and establishing the version merging relationship based on the current version number and the target merging version number.
Preferably, the target source path information includes first target source path information and second target source path information; the target merging version number comprises a first target merging version number and a second target merging version number; the current version information further comprises a first merging version number corresponding to the first source path information; the historical version number information further comprises a second merging version number corresponding to the second source path information; the step of determining target source path information and a target merging version number corresponding to the target source path information according to the difference between the first source path information and the second source path information includes:
traversing the first source path information and the second source path information;
determining first source path information which is not matched with the second source path information as first target source path information, and determining a first target merging version number corresponding to the first target source path information;
determining second source path information matched with the first target source path information as second target source path information; and determining that the version number which is not matched with the first merging version number in the second merging version numbers corresponding to the second target source path information is a second target merging version number.
Preferably, the step of establishing the version merging relationship based on the current version number and the target merging version number includes:
determining the current version number as key information;
determining the first target source path information and the first target merging version number as first value information;
determining the second target source path information and the second target merging version number as second value information;
and generating second key-value pair data by adopting the key information, the first value information and the second value information.
Preferably, the method further comprises:
and displaying the version merging relationship.
Preferably, the step of presenting the version merging relationship includes:
a version identification icon uniquely corresponding to the current version information and the historical version information is arranged;
and connecting the version identification icon by adopting a preset connection symbol and the version combination relation.
Preferably, the method further comprises:
collecting relation modification operation input by a user;
and modifying the version merging relationship by adopting the relationship modification operation.
The embodiment of the invention also discloses an information processing device, which comprises:
the target path acquisition module is used for acquiring target path information;
the version information acquisition module is used for acquiring current version information corresponding to the target path information and historical version information;
and the merging relationship determining module is used for determining the version merging relationship between the current version information and the historical version information according to the difference between the current version information and the historical version information.
Preferably, the target path obtaining module may include:
the root directory submodule is used for acquiring root directory information;
the first traversal submodule is used for traversing the root directory information and acquiring first key-value pair data containing merging characteristic information;
and the target path extraction sub-module is used for extracting the target path information in the first key-value pair data.
Preferably, the version information obtaining module may include:
the second traversal submodule is used for traversing the target path information and acquiring log information corresponding to the target path information; the log information records a current version number corresponding to the target path information and a historical version number before the current version number;
a current version information obtaining submodule for obtaining current version information corresponding to the current version number;
and the historical version information acquisition submodule is used for acquiring the historical version information corresponding to the historical version number.
Preferably, the current version information includes first source path information and a first merging version number corresponding to the first source path information; the historical version number information comprises the second source path information and a second combined version number corresponding to the second source path information; the mergerelationship determination module 303 may include:
the target information determining submodule is used for determining target source path information and a target merging version number corresponding to the target source path information according to the difference between the first source path information and the second source path information;
and the merging relationship establishing submodule is used for establishing the version merging relationship based on the current version number and the target merging version number.
Preferably, the target source path information includes first target source path information and second target source path information; the target merging version number comprises a first target merging version number and a second target merging version number; the current version information further comprises a first merging version number corresponding to the first source path information; the historical version number information further comprises a second combined version number corresponding to the second source path information; the target information determination sub-module may include:
a source path traversing unit, configured to traverse the first source path information and the second source path information;
a first target version determining unit, configured to determine that first source path information that does not match the second source path information is first target source path information, and determine a first target merging version number corresponding to the first target source path information;
a second target version determining unit, configured to determine that second source path information matched with the first target source path information is second target source path information; and determining that the version number which is not matched with the first merging version number in the second merging version numbers corresponding to the second target source path information is a second target merging version number.
Preferably, the merge relationship establishing sub-module may include:
a key information unit for determining the current version number as key information;
a first value information unit, configured to determine that the first target source path information and the first target merging version number are first value information;
a first value information unit, configured to determine that the second target source path information and the second target merging version number are second value information;
and the key value pair generating unit is used for generating second key value pair data by adopting the key information, the first value information and the second value information.
Preferably, the apparatus may further include:
and the display module is used for displaying the version merging relationship.
Preferably, the display module may include:
the icon identification setting unit is used for setting a version identification icon which is uniquely corresponding to the current version information and the historical version information;
and the icon identification connecting unit is used for connecting the version identification icon by adopting a preset connecting symbol and the version combination relation.
Preferably, the apparatus may further comprise:
the modification acquisition module is used for acquiring relationship modification operation input by a user;
and the relationship modifying module is used for modifying the version merging relationship by adopting the relationship modifying operation.
The embodiment of the invention also discloses an electronic device, which can comprise a processor, a memory and a computer program which is stored on the memory and can run on the processor, wherein the steps of the information processing method are realized when the computer program is executed by the processor.
The embodiment of the invention also discloses a computer readable storage medium, a computer program is stored on the computer readable storage medium, and the steps of the information processing method are realized when the computer program is executed by a processor.
The embodiment of the invention has the following advantages: the method comprises the steps of obtaining current version information corresponding to target path information and historical version information through the target path information, comparing the difference between the current version information and the historical version information, and determining source path information forming the current version and a combined version number corresponding to the source path information, so that the combined relation between different versions is confirmed through the target path information, the problem that in the prior art, the combined relation between different versions can be obtained only by inquiring log information submitted by different versions one by one is avoided, and the inquiring efficiency of a user on the version information is improved.
Drawings
FIG. 1 is a flowchart illustrating steps of a first embodiment of a method for processing information according to the present invention;
FIG. 2 is a flowchart illustrating steps of a second embodiment of an information processing method according to the present invention;
fig. 3 is a block diagram of an embodiment of an information processing apparatus according to the present invention.
Detailed Description
In order to make the aforementioned objects, features and advantages of the present invention comprehensible, embodiments accompanied with figures are described in further detail below.
Referring to fig. 1, a flowchart illustrating steps of a first embodiment of an information processing method according to the present invention is shown, which may specifically include the following steps:
the embodiment of the invention can be applied to a version control system (such as SVN), when a user carries out version combination in the version control system, the version control system can store combination information related to the version, and the path address stored by the combination information is the target path information.
102, acquiring current version information corresponding to the target path information and historical version information;
the merging information corresponding to the target path information may be acquired by a preset method, and the current version information and the historical version information corresponding to the target path information may be determined by the merging information.
And 103, determining a version merging relationship between the current version information and the historical version information according to the difference between the current version information and the historical version information.
The current version information comprises first source path information and a first merging version number corresponding to the first source path information; the historical version number information includes the second source path information and a second merged version number corresponding to the second source path information. The source path information constituting the current version and the merged version number corresponding to the source path information may be determined by comparing differences between the current version information and the historical version information.
In the embodiment of the invention, the current version information corresponding to the target path information and the historical version information are obtained through the target path information, the difference between the current version information and the historical version information is compared, and the source path information forming the current version and the combined version number corresponding to the source path information are determined, so that the combined relation between different versions is determined through the target path information, the condition that in the prior art, the combined relation between different versions can be obtained only by inquiring log information submitted by different versions one by one is avoided, and the inquiring efficiency of a user on the version information is improved.
Referring to fig. 2, a flowchart illustrating steps of a second embodiment of the information processing method according to the present invention is shown, which may specifically include the following steps:
the embodiment of the invention can be applied to a version control system (such as SVN), when a user carries out version combination in the version control system, the version control system can store combination information related to the version, and the path address stored by the combination information is the target path information. The current version information may include first source path information, a first merging version number corresponding to the first source path information; the historical version number information may include the second source path information, a second merged version number corresponding to the second source path information. The source path information is a path address of a previous version used for acquiring the current version. The merging version number is one or more version numbers corresponding to the source path information.
In a preferred embodiment of the present invention, step 201 may include:
substep S11, obtaining root directory information;
the root directory information may be determined by customization, or by scanning the version control system. The root directory information may be a URL address.
Substep S12, traversing the root directory information, and acquiring first key-value pair data containing merging characteristic information;
the root directory information may include a plurality of branch address information, and the first key-value pair data including the merged feature information is obtained by traversing the root directory information in a recursive query manner.
The merging feature information may be information for identifying a merging feature, such as: in SVN, the merge feature information may refer to parameters of SVN mergeinfo attribute. The data containing the merging characteristic information is the merging information.
A key-value pair is a type of data consisting of key information and corresponding value information, which may be separated by a preset first symbol, may hold one or more kinds of information, and may be separated by a preset second symbol (e.g., key information is separated from value information by "-", information in value is separated by ": etc.). In this embodiment of the present invention, the key information of the first key-value pair data may be target path information, and the value information of the first key-value pair data may be composed of source path information and a merged version number.
And a substep S13 of extracting the target path information in the first key-value pair data.
Analyzing the acquired first key-value pair data, extracting key information, namely target path information, in the first key-value pair data, and storing the extracted target path information into a preset data table one by one.
the merging information corresponding to the target path information may be acquired by a preset method, and the current version information and the historical version information corresponding to the target path information may be determined by the merging information.
In a preferred embodiment of the present invention, step 202 may comprise:
step S21, traversing the target path information to obtain the log information corresponding to the target path information; the log information records a current version number corresponding to the target path information and a historical version number before the current version number;
the data table storing the target path information may be adopted, each target path information in the data table is traversed, and a preset function is adopted, and the log information corresponding to the target path information is adopted.
Substep S22, obtaining current version information corresponding to the current version number;
and acquiring current version information corresponding to the current version number by adopting a preset merging information acquisition function.
And a substep S23 of acquiring history version information corresponding to the history version number.
And acquiring historical version information corresponding to the historical version number by adopting a preset merging information acquisition function.
The version merge relationship between different versions may be determined by comparing the difference between the current version information and the historical version information.
In a preferred embodiment of the present invention, step 203 may comprise:
substep S31, determining target source path information and a target merging version number corresponding to the target source path information according to a difference between the first source path information and the second source path information;
by comparing the difference between the first source path information and the second source path information, the version corresponding to the current version number can be determined, and the versions are generated by combining previous versions. Specifically, the version corresponding to the current version number is generated by merging versions corresponding to the target merging version number corresponding to the target source path information.
And a substep S32 of establishing the version merging relationship based on the current version number and the target merging version number.
And establishing a version merging relationship based on the current version number and the target merging version number, and clearly showing the version numbers of one or more historical versions merging and generating the current version.
In practical application, the version identification information, the branch identification information, the target merging version number identification information and the source branch identification information corresponding to the current version can be obtained and stored.
In a preferred embodiment of the present invention, the target source path information includes first target source path information and second target source path information; the target merging version number comprises a first target merging version number and a second target merging version number; the current version information further comprises a first merging version number corresponding to the first source path information; the historical version number information further comprises a second merging version number corresponding to the second source path information; the substep S31 includes:
substep S311, traversing the first source path information and the second source path information;
substep S312, determining first source path information not matching the second source path information as first target source path information, and determining a first target merging version number corresponding to the first target source path information;
the substep S313, determining the second source path information matched with the first target source path information as the second target source path information; and determining that the version number which is not matched with the first merging version number in the second merging version numbers corresponding to the second target source path information is a second target merging version number.
In practical applications, the first source path information and the first merged version information of the first source path information pair may be separated by a preset coincidence (e.g., colon ": and a line break may be set after the first merged version information; similarly, the second source path information and the second merging version information of the pair with the second source path information may be separated by a preset coincidence (e.g., colon: "), and the line break may be set after the second merging version information.
By traversing the first source path information and the second source path information, the difference between the first source path information and the second source path information can be judged.
When first source path information inconsistent with the second source path information exists, determining that the first source path information inconsistent with the second source path information is first target source path information, determining a first target merging version number corresponding to the first target source path information, namely extracting that the source path information which exists in the current version information and does not exist in the historical version information is the first target source path information, and determining a first target merging version number corresponding to the first target source path information.
When first source path information consistent with the second source path information exists, determining that the first source path information consistent with the second source path information is second target source path information, determining that a version number unmatched with the first merging version number in a second merging version number corresponding to the second target source path information is a second target merging version number, namely extracting that the source path information existing in the current version information and the historical version information is the second target source path information, comparing the second merging version number corresponding to the second target source path information with the second merging version number inconsistent with the first merging version number corresponding to the second target source path information, and determining that the version number is a second target merging version number.
In a preferred embodiment of the present invention, the sub-step S32 may include:
substep S321, determining the current version number as key information;
substep S322, determining the first target source path information and the first target merging version number as first value information;
substep S323, determining the second target source path information and the second target merging version number as second value information;
and a substep S324 of generating second key-value pair data by using the key information, the first value information and the second value information.
And forming second key value pair data by adopting the current version number, the first target source path information, the first target merging version number, the second target source path information and the second target merging version number, and determining the historical version forming the current version, namely determining the version merging relation through the second key value pair data.
In the embodiment of the present invention, after thesteps 201 to 203 are executed once, the first source path information is defined as new target path information, and thesteps
In a preferred embodiment of the present invention, the method may further include:
and step 204, displaying the version merging relationship.
The merge relationship may be presented in a preset page.
In a preferred embodiment of the present invention, step 204 may comprise:
a substep S41, setting a version identification icon uniquely corresponding to the current version information and the historical version information;
a uniquely matching version identification icon may be set for each version number.
And a substep S42 of connecting the version identification icons by using a preset connection symbol and the version combination relationship.
The preset connection symbols are connected with the version identification icons, so that the combination relation among different versions can be clearly and intuitively acquired. For example: and sorting according to version numbers by adopting a solid line, connecting different version identification icons, and connecting the version identification icons with different scores and having a merging relation by adopting a dotted line.
In a preferred embodiment of the present invention, the method may further include:
after the merging relation is generated, a user can perform data verification on the merging relation, and when the merging relation is found to have an error, the correct merging relation can be manually input.
And step 206, modifying the version merging relationship by adopting the relationship modification operation.
The original version merging relation information can be modified by adopting the merging relation input by the user, and the modified version merging relation is displayed.
In practical application, a user can directly modify the connection symbols between the version identification icons and modify the version merging relationship.
In the embodiment of the invention, the current version information and the historical version information corresponding to the target path information are obtained through the target path information, the difference between the current version information and the historical version information is compared, the source path information forming the current version and the combined version number corresponding to the source path information are determined, so that the combined relation between different versions is confirmed through the target path information, the corresponding version identification icon is generated for each version information, and the combined relation is displayed through the version identification icon, the condition that in the prior art, the combined relation between different versions information can be obtained only by inquiring log information submitted by different versions one by one is avoided, and the inquiring efficiency of a user on the version information is improved.
Furthermore, the user can directly correct the version merging relationship aiming at the connection coincidence between the version identification icons, and the management of the user aiming at the merging relationship between the versions is provided.
Furthermore, the merging relation between different branches and versions can be visually displayed to the user through the icons and the connection symbols, and the management of the user on the version relation between different branches is improved.
It should be noted that, for simplicity of description, the method embodiments are described as a series of acts or combination of acts, but those skilled in the art will recognize that the present invention is not limited by the illustrated order of acts, as some steps may occur in other orders or concurrently in accordance with the embodiments of the present invention. Further, those skilled in the art will appreciate that the embodiments described in the specification are presently preferred and that no particular act is required to implement the invention.
Referring to fig. 3, a block diagram of an embodiment of an information processing apparatus according to the present invention is shown, and may specifically include the following modules:
a targetpath obtaining module 301, configured to obtain target path information;
a versioninformation obtaining module 302, configured to obtain current version information corresponding to the target path information and historical version information;
a mergingrelationship determining module 303, configured to determine a version merging relationship between the current version information and the historical version information according to a difference between the current version information and the historical version information.
In a preferred embodiment of the present invention, the targetpath obtaining module 301 may include:
the root directory submodule is used for acquiring root directory information;
the first traversal submodule is used for traversing the root directory information and acquiring first key-value pair data containing merging characteristic information;
and the target path extraction sub-module is used for extracting the target path information in the first key-value pair data.
In a preferred embodiment of the present invention, the versioninformation obtaining module 302 may include:
the second traversal submodule is used for traversing the target path information and acquiring log information corresponding to the target path information; the log information records a current version number corresponding to the target path information and a historical version number before the current version number;
a current version information obtaining submodule, configured to obtain current version information corresponding to the current version number;
and the historical version information acquisition submodule is used for acquiring the historical version information corresponding to the historical version number.
In a preferred embodiment of the present invention, the current version information includes first source path information, a first merging version number corresponding to the first source path information; the historical version number information comprises the second source path information and a second combined version number corresponding to the second source path information; the mergerelationship determination module 303 may include:
the target information determining submodule is used for determining target source path information and a target merging version number corresponding to the target source path information according to the difference between the first source path information and the second source path information;
and the merging relationship establishing submodule is used for establishing the version merging relationship based on the current version number and the target merging version number.
In a preferred embodiment of the present invention, the target source path information includes first target source path information and second target source path information; the target merging version number comprises a first target merging version number and a second target merging version number; the current version information further comprises a first merging version number corresponding to the first source path information; the historical version number information further comprises a second combined version number corresponding to the second source path information; the target information determination sub-module may include:
a source path traversing unit, configured to traverse the first source path information and the second source path information;
a first target version determining unit, configured to determine that first source path information that does not match the second source path information is first target source path information, and determine a first target merging version number corresponding to the first target source path information;
a second target version determining unit, configured to determine that second source path information matched with the first target source path information is second target source path information; and determining that the version number which is not matched with the first merging version number in the second merging version numbers corresponding to the second target source path information is a second target merging version number.
In a preferred embodiment of the present invention, the merge relation establishing sub-module may include:
a key information unit for determining the current version number as key information;
a first value information unit, configured to determine that the first target source path information and the first target merging version number are first value information;
a first value information unit, configured to determine that the second target source path information and the second target merging version number are second value information;
and the key value pair generating unit is used for generating second key value pair data by adopting the key information, the first value information and the second value information.
In a preferred embodiment of the present invention, the apparatus may further include:
and the display module is used for displaying the version merging relationship.
In a preferred embodiment of the present invention, the display module may include:
the icon identification setting unit is used for setting a version identification icon which is uniquely corresponding to the current version information and the historical version information;
and the icon identification connecting unit is used for connecting the version identification icon by adopting a preset connecting symbol and the version combination relation.
In a preferred embodiment of the present invention, the apparatus may further include:
the modification acquisition module is used for acquiring relationship modification operation input by a user;
and the relationship modifying module is used for modifying the version merging relationship by adopting the relationship modifying operation.
For the device embodiment, since it is basically similar to the method embodiment, the description is simple, and for the relevant points, refer to the partial description of the method embodiment.
An embodiment of the present invention further provides an electronic device, which may include a processor, a memory, and a computer program stored in the memory and capable of running on the processor, and when being executed by the processor, the computer program implements the above information processing method embodiment.
An embodiment of the present invention further provides a computer-readable storage medium, on which a computer program is stored, and when the computer program is executed by a processor, the embodiment of the information processing method is implemented.
The embodiments in the present specification are all described in a progressive manner, and each embodiment focuses on differences from other embodiments, and portions that are the same and similar between the embodiments may be referred to each other.
As will be appreciated by one skilled in the art, embodiments of the present invention may be provided as a method, apparatus, or computer program product. Accordingly, embodiments of the present invention may take the form of an entirely hardware embodiment, an entirely software embodiment or an embodiment combining software and hardware aspects. Furthermore, embodiments of the present invention may take the form of a computer program product embodied on one or more computer-usable storage media (including, but not limited to, disk storage, CD-ROM, optical storage, and the like) having computer-usable program code embodied therein.
Embodiments of the present invention are described with reference to flowchart illustrations and/or block diagrams of methods, terminal devices (systems), and computer program products according to embodiments of the invention. It will be understood that each flow and/or block of the flow diagrams and/or block diagrams, and combinations of flows and/or blocks in the flow diagrams and/or block diagrams, can be implemented by computer program instructions. These computer program instructions may be provided to a processor of a general purpose computer, special purpose computer, embedded processor, or other programmable data processing terminal to produce a machine, such that the instructions, which execute via the processor of the computer or other programmable data processing terminal, create means for implementing the functions specified in the flowchart flow or flows and/or block diagram block or blocks.
These computer program instructions may also be stored in a computer-readable memory that can direct a computer or other programmable data processing terminal to function in a particular manner, such that the instructions stored in the computer-readable memory produce an article of manufacture including instruction means which implement the function specified in the flowchart flow or flows and/or block diagram block or blocks.
These computer program instructions may also be loaded onto a computer or other programmable data processing terminal to cause a series of operational steps to be performed on the computer or other programmable terminal to produce a computer implemented process such that the instructions which execute on the computer or other programmable terminal provide steps for implementing the functions specified in the flowchart flow or flows and/or block diagram block or blocks.
While preferred embodiments of the present invention have been described, additional variations and modifications of these embodiments may occur to those skilled in the art once they learn of the basic inventive concepts. Therefore, it is intended that the appended claims be interpreted as including preferred embodiments and all such alterations and modifications as fall within the scope of the embodiments of the invention.
Finally, it should also be noted that, herein, relational terms such as first and second, and the like may be used solely to distinguish one entity or action from another entity or action without necessarily requiring or implying any actual such relationship or order between such entities or actions. Also, the terms "comprises," "comprising," or any other variation thereof, are intended to cover a non-exclusive inclusion, such that a process, method, article, or terminal that comprises a list of elements does not include only those elements but may include other elements not expressly listed or inherent to such process, method, article, or terminal. Without further limitation, an element defined by the phrase "comprising an … …" does not exclude the presence of other like elements in a process, method, article, or terminal that comprises the element.
The above detailed description is provided for an information processing method, an information processing apparatus, an electronic device, and a storage medium, and the principles and embodiments of the present invention are described herein by using specific examples, and the descriptions of the above examples are only used to help understand the method and the core idea of the present invention; meanwhile, for a person skilled in the art, according to the idea of the present invention, the specific embodiments and the application range may be changed, and in summary, the content of the present specification should not be construed as a limitation to the present invention.
Claims (11)
1. An information processing method, characterized in that the method comprises:
acquiring target path information;
acquiring current version information corresponding to the target path information and historical version information; the current version information comprises first source path information, and the historical version information comprises second source path information; acquiring a current version number corresponding to the current version information through the target path information;
determining the version merging relationship between the current version information and the historical version information according to the difference between the current version information and the historical version information;
the step of determining the version merging relationship between the current version information and the historical version information according to the difference between the current version information and the historical version information includes:
determining target source path information and a target merging version number corresponding to the target source path information according to the difference between the first source path information and the second source path information;
and establishing the version merging relationship based on the current version number and the target merging version number.
2. The method of claim 1, wherein the step of obtaining target path information comprises:
acquiring root directory information;
traversing the root directory information to acquire first key-value pair data containing merging characteristic information;
and extracting target path information in the first key-value pair data.
3. The method according to claim 1, wherein the step of obtaining current version information corresponding to the target path information and historical version information comprises:
traversing the target path information to obtain log information corresponding to the target path information; the log information records a current version number corresponding to the target path information and a historical version number before the current version number;
acquiring current version information corresponding to the current version number;
and acquiring historical version information corresponding to the historical version number.
4. The method of claim 1, wherein the target source path information comprises first target source path information and second target source path information; the target merging version number comprises a first target merging version number and a second target merging version number; the current version information further comprises a first merging version number corresponding to the first source path information; the historical version information further comprises a second combined version number corresponding to the second source path information; the step of determining target source path information and a target merging version number corresponding to the target source path information according to the difference between the first source path information and the second source path information includes:
traversing the first source path information and the second source path information;
determining first source path information which is not matched with the second source path information as first target source path information, and determining a first target merging version number corresponding to the first target source path information;
determining second source path information matched with the first target source path information as second target source path information; and determining that the version number which is not matched with the first merging version number in the second merging version numbers corresponding to the second target source path information is a second target merging version number.
5. The method of claim 4, wherein the step of establishing the version merging relationship based on the current version number and the target merging version number comprises:
determining the current version number as key information;
determining the first target source path information and the first target merging version number as first value information;
determining the second target source path information and the second target merging version number as second value information;
and generating second key-value pair data by adopting the key information, the first value information and the second value information.
6. The method according to any one of claims 1-5, further comprising:
and displaying the version merging relationship.
7. The method of claim 6, wherein the step of exposing the version merge relationship comprises:
a version identification icon uniquely corresponding to the current version information and the historical version information is arranged;
and connecting the version identification icon by adopting a preset connection symbol and the version combination relation.
8. The method of claim 7, further comprising:
collecting relation modification operation input by a user;
and modifying the version merging relationship by adopting the relationship modification operation.
9. An information processing apparatus characterized in that the apparatus comprises:
the target path acquisition module is used for acquiring target path information;
the version information acquisition module is used for acquiring current version information corresponding to the target path information and historical version information; the current version information comprises first source path information, and the historical version information comprises second source path information; acquiring a current version number corresponding to the current version information through the target path information;
the merging relation determining module is used for determining the version merging relation between the current version information and the historical version information according to the difference between the current version information and the historical version information;
the merge relationship determination module includes:
the target information determining submodule is used for determining target source path information and a target merging version number corresponding to the target source path information according to the difference between the first source path information and the second source path information;
and the merging relationship establishing submodule is used for establishing the version merging relationship based on the current version number and the target merging version number.
10. Electronic device, characterized in that it comprises a processor, a memory and a computer program stored on said memory and capable of running on said processor, said computer program, when executed by said processor, implementing the steps of the information processing method according to any one of claims 1 to 8.
11. Computer-readable storage medium, characterized in that a computer program is stored on the computer-readable storage medium, which computer program, when being executed by a processor, carries out the steps of the information processing method according to any one of claims 1 to 8.
Priority Applications (1)
| Application Number | Priority Date | Filing Date | Title |
|---|---|---|---|
| CN201811246909.XACN109358898B (en) | 2018-10-24 | 2018-10-24 | Information processing method and device, electronic equipment and storage medium |
Applications Claiming Priority (1)
| Application Number | Priority Date | Filing Date | Title |
|---|---|---|---|
| CN201811246909.XACN109358898B (en) | 2018-10-24 | 2018-10-24 | Information processing method and device, electronic equipment and storage medium |
Publications (2)
| Publication Number | Publication Date |
|---|---|
| CN109358898A CN109358898A (en) | 2019-02-19 |
| CN109358898Btrue CN109358898B (en) | 2022-09-13 |
Family
ID=65346513
Family Applications (1)
| Application Number | Title | Priority Date | Filing Date |
|---|---|---|---|
| CN201811246909.XAActiveCN109358898B (en) | 2018-10-24 | 2018-10-24 | Information processing method and device, electronic equipment and storage medium |
Country Status (1)
| Country | Link |
|---|---|
| CN (1) | CN109358898B (en) |
Families Citing this family (5)
| Publication number | Priority date | Publication date | Assignee | Title |
|---|---|---|---|---|
| CN111176871B (en)* | 2019-08-01 | 2022-02-08 | 腾讯科技（深圳）有限公司 | Target application processing method and device, storage medium and electronic device |
| CN110659210A (en)* | 2019-09-20 | 2020-01-07 | 深圳创维－Rgb电子有限公司 | Information acquisition method and device, electronic equipment and storage medium |
| CN111552778B (en)* | 2020-04-26 | 2024-05-14 | 北京达佳互联信息技术有限公司 | Audio resource management method, device, computer readable storage medium and equipment |
| CN111736895A (en)* | 2020-08-10 | 2020-10-02 | 北京信安世纪科技股份有限公司 | Method, equipment and storage medium for merging and upgrading version numbers of software products |
| CN111966353A (en)* | 2020-08-13 | 2020-11-20 | 北京金山云网络技术有限公司 | Job development method and device, electronic equipment and storage medium |
Citations (7)
| Publication number | Priority date | Publication date | Assignee | Title |
|---|---|---|---|---|
| CN1976283A (en)* | 2005-12-01 | 2007-06-06 | 国际商业机器公司 | System and method of combining metadata of file in backup storage device |
| CN101546318A (en)* | 2008-03-27 | 2009-09-30 | 林兆祥 | Data storage method based on version |
| CN101593185A (en)* | 2008-05-29 | 2009-12-02 | 国际商业机器公司 | Utilize and carry out the method and system that data are recovered synchronously |
| CN103092947A (en)* | 2013-01-11 | 2013-05-08 | 辽宁省电力有限公司朝阳供电公司 | A data version control method |
| US9047334B1 (en)* | 2009-07-31 | 2015-06-02 | David R. Cheriton | Merge-update for efficient atomic memory modification in concurrent computer systems |
| CN106445529A (en)* | 2016-09-27 | 2017-02-22 | 乐视控股（北京）有限公司 | Backup method and system for configuration information of continuous integration server |
| CN106685729A (en)* | 2017-01-18 | 2017-05-17 | 郑州云海信息技术有限公司 | Method and system for service configuration management |
Family Cites Families (3)
| Publication number | Priority date | Publication date | Assignee | Title |
|---|---|---|---|---|
| JP6024559B2 (en)* | 2013-03-28 | 2016-11-16 | 富士通株式会社 | Program and version control method |
| CN106886410B (en)* | 2017-01-06 | 2018-06-19 | 深圳云天励飞技术有限公司 | A kind of software version management system |
| CN107894895A (en)* | 2017-11-06 | 2018-04-10 | 网易（杭州）网络有限公司 | Processing method, device, storage medium, processor and the server of code update |
- 2018
- 2018-10-24CNCN201811246909.XApatent/CN109358898B/enactiveActive
Patent Citations (7)
| Publication number | Priority date | Publication date | Assignee | Title |
|---|---|---|---|---|
| CN1976283A (en)* | 2005-12-01 | 2007-06-06 | 国际商业机器公司 | System and method of combining metadata of file in backup storage device |
| CN101546318A (en)* | 2008-03-27 | 2009-09-30 | 林兆祥 | Data storage method based on version |
| CN101593185A (en)* | 2008-05-29 | 2009-12-02 | 国际商业机器公司 | Utilize and carry out the method and system that data are recovered synchronously |
| US9047334B1 (en)* | 2009-07-31 | 2015-06-02 | David R. Cheriton | Merge-update for efficient atomic memory modification in concurrent computer systems |
| CN103092947A (en)* | 2013-01-11 | 2013-05-08 | 辽宁省电力有限公司朝阳供电公司 | A data version control method |
| CN106445529A (en)* | 2016-09-27 | 2017-02-22 | 乐视控股（北京）有限公司 | Backup method and system for configuration information of continuous integration server |
| CN106685729A (en)* | 2017-01-18 | 2017-05-17 | 郑州云海信息技术有限公司 | Method and system for service configuration management |
Non-Patent Citations (9)
| Title |
|---|
| 7 Subversion SVN Merge Command Examples for Branch and Trunks;SANTOSH YADAV;《HTTPS://WWW.THEGEEKSTUFF.COM/2014/03/SVN-MERGE-COMMAND/》;20140305;第1-13页* |
| A novel approach to versioning and merging model and code uniformly;Omar Badreddin等;《2014 2nd International Conference on Model-Driven Engineering and Software Development (MODELSWARD)》;20150126;第1-10页* |
| Maintaining SVN history for a file when merge is done from the dev branch to trunk?;Sam;《https://softwareengineering.stackexchange.com/questions/206016/maintaining-svn-history-for-a-file-when-merge-is-done-from-the-dev-branch-to-tru》;20130725;第1-3页* |
| SVN与协作平台的集成研究;黎存金;《中国优秀硕士学位论文全文数据库 信息科技辑》;20131215;第I138-696页* |
| tortoiseSVN版本合并（merge）;jiangxiaobo;《https://www.cnblogs.com/jiangxiaobo/p/8949855.html》;20180426;第1-3页* |
| 专家全面剖析SVN合并跟踪问题;rocksun;《https://developer.51cto.com/art/201006/203099.htm》;20100601;第1-4页* |
| 在eclipse中使用svn来比较版本差异及查看各个版本的代码;hawanglc;《https://blog.csdn.net/hawanglc/article/details/54380228?locationNum=1&fps=1》;20170112;第1-4页* |
| 基于SVN的统一协作平台设计与实现;贺自军;《中国优秀硕士学位论文全文数据库 信息科技辑》;20100315;第I138-259页* |
| 如何用 Git 合并两个库（合并历史记录，解决冲突／改写路径）;helloxielan;《https://blog.csdn.net/weixin_33739627/article/details/91929718》;20170416;第1-4页* |
Also Published As
| Publication number | Publication date |
|---|---|
| CN109358898A (en) | 2019-02-19 |
Similar Documents
| Publication | Publication Date | Title |
|---|---|---|
| CN109358898B (en) | Information processing method and device, electronic equipment and storage medium | |
| CN112925757A (en) | Method, equipment and storage medium for tracking operation log of intelligent equipment | |
| CN106933897B (en) | Data query method and device | |
| CN109753289B (en) | Art resource merging method and device, electronic equipment and storage medium | |
| CN112328499A (en) | Test data generation method, device, equipment and medium | |
| CN114610286A (en) | Method, device, computer equipment and storage medium for generating development documents | |
| CN113900955A (en) | Automated testing method, device, equipment and storage medium | |
| CN111309371A (en) | Query method and device | |
| CN113918606B (en) | Log query method and device | |
| CN112306870A (en) | Data processing method and device based on live APP | |
| CN111143582B (en) | Multimedia resource recommendation method and device for updating association words in double indexes in real time | |
| CN109508203B (en) | Method, device and system for determining version consistency | |
| CN112364185A (en) | Method and device for determining characteristics of multimedia resource, electronic equipment and storage medium | |
| CN110765318A (en) | Method and device for inquiring block chain data | |
| CN116955065A (en) | Buried point identification generation method, electronic device, and computer-readable storage medium | |
| CN113052532B (en) | Bill of materials detection method, apparatus, device and medium | |
| CN115563170A (en) | Data analysis method and device, electronic equipment and computer storage medium | |
| CN114398432A (en) | Data display method, apparatus, computer equipment and storage medium | |
| US10861021B2 (en) | State value indexing into an action database | |
| CN114237591A (en) | Method and device for incorporating code | |
| CN113448777A (en) | Data recovery method and device | |
| CN113485689A (en) | Buried point processing method and device | |
| CN109885739B (en) | Data processing method, system and storage medium | |
| CN111177241A (en) | Data processing method, device and system, electronic equipment and storage medium thereof | |
| CN119621793B (en) | Property budget data acquisition method, device, equipment and storage medium |
Legal Events
| Date | Code | Title | Description |
|---|---|---|---|
| PB01 | Publication | ||
| PB01 | Publication | ||
| SE01 | Entry into force of request for substantive examination | ||
| SE01 | Entry into force of request for substantive examination | ||
| GR01 | Patent grant | ||
| GR01 | Patent grant |