[platform-vcm-dev] Changes in sync view that affect everyone

[James_Moody@xxxxxxx]

I've made changes to the workflow in the sync view. This affects all 
people using the 2.0 Team codebase for CVS development. (Which should be 
everyone pretty soon...).

Summary of the new actions:

Incoming mode:
        Update from Repository (operates ONLY on incoming nodes)
        Override and Update (operates on conflicts)
Outgoing mode:
        Commit (operates only on outgoing nodes)
        Override and Commit (operates on conflicts)
Both mode:
        Update from Repository (operates ONLY on incoming nodes)
        Override and Update (operates on conflicts *and* on outgoing 
changes)
        Commit (operates only on outgoing nodes)
        Override and Commit (operates on conflicts *and* on incoming 
changes)

The main purpose of this change is to force the user to handle conflicts 
separately from non-conflicts. In particular, selecting a tree with both 
outgoing changes and conflicts in it, and choosing 'Commit' will now only 
commit the outgoing changes, leaving the conflicts in the tree. Likewise, 
selecting a tree both both incoming changes and conflicts, and choosing 
'Update' will now only update the incoming changes, leaving the conflicts. 
The conflicts are handled via a second menu item ('Override and Commit' 
and 'Override and Update', respectively). I'm not overly attached to the 
names of these new actions, so if anyone has any suggestions I'd like to 
hear them.

Also note that the difference in behaviour in the 'Both' mode. Again, 
conflicts and against-the-flow changes are handled with the 'Override' 
commands.

If anyone has any feedback on the usability of this new mode of operation, 
or suggestions for action names, please send them to 
platform-vcm-dev@xxxxxxxxxxx.

These changes will be in todays integration build.

Thanks,

james