Browse Prior Art Database

A method and apparatus for merging source code by Instance Message

IP.com Disclosure Number: IPCOM000197580D
Publication Date: 2010-Jul-15
Document File: 3 page(s) / 100K

Publishing Venue

The IP.com Prior Art Database

Abstract

A software project team is always consisting of many people. The conflict always occurs when people check-in his/her code to the repository. The problem is that every developer has his thoughts to do the modification, and the modification isn't independent, so the merge will change other's implementation logic. The invention provides a method and apparatus which integrating IM with version control system to solve the problem.

This text was extracted from a PDF file.
At least one non-text object (such as an image or picture) has been suppressed.
This is the abbreviated version, containing approximately 50% of the total text.

Page 1 of 3

A method and apparatus for merging source code by Instance Message

1. Background: What is the problem solved by your invention? Describe known solutions to this problem (if any). What are the drawbacks of such known solutions, or why is an additional solution required? Cite any relevant technical documents or references.

A software project team is always consisting of many people. There are many source code version control system like cvs, svn, and IBM's clearcase. When people check-in the code to the repository, the potential conflict always occurs because there are other team members also working on same part.

The existing version control systems provide different comparison files to developers, and then let them manually merge the conflict code during update state. When the developer update his code from source repository, and find out there are some conflicts. He will read the other developer's code, and try to merge them with his code. The developer has to spend more time to work on it. The problem is that every developer has his thoughts to do the modification, and the modification isn't independent. His merge will change other's implementation logic.

The invention provides a method and apparatus which integrating IM with version control system to solve the problem.

2. Summary of Invention: Briefly describe the core idea of your invention (saving the details for questions #3 below). Describe the advantage(s) of using your invention instead of the known solutions described above.

The basic idea is described as following. Firstly, add developers into an IM user group when they check out a source module from version control system. Secondly, add an IM plugin to detect any modifications at local copy and send it to server when developer online. Thirdly,

when a developer

checks in his code to said version control system, detects whether the code to be committed is conflict

with others changes. If there is any conflict, looks up all relevant developers in the said group and

setup an IM session for all online developers, and allows them to merge their code by instance message tools. If the relevant developer is not online,

just get the changed copy for reference. Lastly,

the developer checks-in the code to repository.

Novelty:

A lightweight method to aware all developers' changes in the same source module.

A method and apparatus to reducing the merge effort during source code conflict by IM

The advantages of the method are listed following:

Reduce conflict

Improve productivity

3. Description: Describe how your invention works, and how it could be implemented, using text, diagrams and flow charts as appropriate.

This method provides a new approach which integrating Instance Message tool with source code repository tooling to reduce source code conflict.

The major steps include:

Constructs IM user group when user checks-out the same code from version control system

1.

Replicates local copy changes and sends all changed files to versi...