Browse Prior Art Database

Ability to selectively commit code within a file

IP.com Disclosure Number: IPCOM000200684D
Publication Date: 2010-Oct-25
Document File: 2 page(s) / 26K

Publishing Venue

The IP.com Prior Art Database

Abstract

This article describes a method to selectively commit code within a file.

This text was extracted from a PDF file.
This is the abbreviated version, containing approximately 56% of the total text.

Page 01 of 2

Ability to selectively commit code within a file

Disclosed is a process to enable a user to select specific changes in a certain section or multiple sections of a particular tested configuration the user wants to commit and request the system to only commit those changes within a file.

Sometimes a user makes multiple changes in a single file, but wants to check in only some of the changes to the server while keeping the other changes local for a time being. Currently there is no easy way to do this in one step. As a workaround the user would have to save the changes that the user does not want to commit in a different file, and re-apply the changes manually after the commit.

The disclosed process provides a capability to commit changes within a file selectively, instead of checking in the entire file. Using the disclosed process enables a user to check in changes on the tested configuration and eliminate the need to revert a local change (which can be error

j

    ust for the purpose of checking in desired portions of the file. The disclosed process of a selective commit is useful for small incremental commits, which are often encouraged in a development community for easy code review.

For example, a user has a personal configuration on a personal machine that is not suitable for check in to the source code repository. Whenever the user makes other changes in the configuration file that need to be checked into the server, the user has to revert a personal configuration change locally first so that the personal configuration change would not be checked in. Occasionally, the user forgets to do that and therefore have to revert an unintentional commit on the server.

Using the disclosed process, when a user has tested a particular configuration, the user can select specific changes in a certain section or multiple sections that the user wants to commit and request the system to only commit those changes within the file.

For example, a local 'bnd' file of the user has a local change indicated in

org.osgi.impl.bundle.webcontainer; version=latest (last line of code snippet for runbundles) which the

user wants to keep locally.

-buildpath= ee.

j2se; version=1.5, \

org.apache.geronimo.specs.geronimo-annotation

org.osgi.test.support; version=

junit}

-runbundles= \
osgi.enterprise; version=${enterprise.

org.osgi.impl.bundle.webcontainer; version=latest

The user made another change in the buildpath configuration in org.osgi.service.support

(second last line of code sni...