1 / 7

Collaborative Editing in Repositories: Managing Locking and Version Control

This document describes a scenario involving two users, Harry and Sally, who engage in collaborative editing on a shared repository. Both begin by editing their copies of the same file, but issues arise when Sally accidentally overwrites Harry’s version. The process includes locking mechanisms to prevent overwrites and an “out-of-date” error that leads to a merged version being created. Ultimately, the merged version allows both users to see each other's changes effectively, illustrating the challenges and solutions in collaborative software development.

marsha
Download Presentation

Collaborative Editing in Repositories: Managing Locking and Version Control

An Image/Link below is provided (as is) to download presentation Download Policy: Content on the Website is provided to you AS IS for your information and personal use and may not be sold / licensed / shared on other websites without getting consent from its author. Content is provided to you AS IS for your information and personal use only. Download presentation by click this link. While downloading, if for some reason you are not able to download a presentation, the publisher may have deleted the file from their server. During download, if you can't get a presentation, the file might be deleted by the publisher.

E N D

Presentation Transcript

  1. Repository read read write Sally Ira Harry

  2. Repository Repository A A read read Harry Sally Harry Sally A A A’ A” Two users read the same file. They both begin to edit their copies. Repository Repository A” A’ write write Harry Sally Harry Sally A’ A” A’ A” Sally accidentally overwrites Harry’s version! Harry publishes his version first.

  3. Repository Repository A A LOCK LOCK read Harry Sally Harry Sally A A’ Harry “locks” file A, then copies it for editing. While Harry edits, Sally’s lock attempt fails. Repository Repository A’ A’ read write UNLOCK LOCK Harry Sally Harry Sally A’ A’ A’ Harry writes his version, then releases his lock. Now Sally can lock, read, and edit the latest version.

  4. Repository Repository A A read read Harry Sally Harry Sally A A A’ A” Two users copy the same file. They both begin to edit their copies. Repository Repository A” A” write write Harry Sally Harry Sally A’ A” A’ A” Harry gets an “out-of-date” error! Sally publishes her version first.

  5. Repository Repository A” A” read Harry Sally Harry Sally A’ A” A” A* A” Harry compares the latest version to his own. A new merged version is created. Repository Repository A* A* write read Harry Sally Harry Sally A* A* A* A” The merged version is published. Now both users have each others’ changes.

  6. / calc Makefile integer.c button.c paint Makefile canvas.c brush.c

  7. 0 1 2 3

More Related