Sun WorkShop TeamWare 2.1 User's Guide

Summary

The following two tables summarize, first, the action taken by Configuring during a Putback transaction in each of the four cases described above and secondly, for the Bringover transaction.

Table 3-3 Putback Transaction

Case 

File in Parent 

File in Child 

Action by Configuring 

Unchanged 

Unchanged 

None 

Unchanged 

Changed 

Update file in parent 

Changed 

Unchanged 

Block Putback, notify user 

Changed 

Changed 

Block Putback, notify user 

Table 3-4 Bringover Transaction

Case 

File in Parent 

File in Child 

Action by Configuring 

Unchanged 

Unchanged 

None 

Unchanged 

Changed 

None 

Changed 

Unchanged 

Update child (extend SCCS files) 

Changed 

Changed 

Merge SCCS history files and notify user of conflicts