Skip to content

Conflicting Common Component modifications #41

Description

@warbe-maker

Background

Supportig the modification of a Common Component in any VB-Project using it is very practical and last but not least realistic. This implicates some complexity however when concurrent modifications made in several VB-Projects, possibly by different developers on different computers (which is supported by CompMan). To understand the issue it is neccessary to keep in mind that a code modification, when exported, becomes registered as a "pending release modification" which requires an extra manual step - once the modification is ready to become public - performed by means of a CompMan menu in the VBE.

Conflicts

Modifying a non up-to-date code version

When the update service displays a dialog to update a used or hosted outdated Common Component, this update may be skipped. However, subsequent code modifications in the concerned VB-Project need to be avoided.

Modifying an already "pending release modification"

When the update service not has suggested an update the Common Component is up-to-date and thus may be modified in the VB-Project using it. However, when there is already a modification "pending release" which had been made within another VB-Project - possibly by another user on another computer (which is supprted by CompMan).

Resolving the conflict

CompMan's export service is the only instance able to address an above issue. In case it has to display a dialog which provides the possibility to display the done modifications plus the following options depending on the type of conflict:

Another modification is already pending

Undo/Reset is the only choice

The modification is not based on an up-to-date code

  1. Undo/Reset to previous
  2. Undo/Reset to current public: Allows modification again which results in a registered pending release
  3. Ignore: Not recommendable, suspends export

Both

Undo/Reset is the only choice

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

Labels

No labels
No labels

Projects

No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions