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 |
---|---|---|---|
1 |
Unchanged |
Unchanged |
None |
2 |
Unchanged |
Changed |
Update file in parent |
3 |
Changed |
Unchanged |
Block Putback, notify user |
4 |
Changed |
Changed |
Block Putback, notify user |
Table 3-4 Bringover Transaction
Case |
File in Parent |
File in Child |
Action by Configuring |
---|---|---|---|
1 |
Unchanged |
Unchanged |
None |
2 |
Unchanged |
Changed |
None |
3 |
Changed |
Unchanged |
Update child (extend SCCS files) |
4 |
Changed |
Changed |
Merge SCCS history files and notify user of conflicts |