Re: What a modern collaboration toolkit looks like

[Stefan Monnier]

Miles> Of course part of the problem is that vc-update seems like a hopelessly
Miles> antiquated interface -- who wants to do merging on a file-by-file basis?!

> Yeah... for vc-status I think we will need a new 'update' back end

Sounds right.

> function.  Also I think we will need a "conflict" state.

Be careful with this one: some backends allow commits with conflicts
(for later resolution).  And for many operations, it doesn't matter if
a file is locally modified or with a conflict, so in many ways
"conflict" is a sub-state of "locally modified".


        Stefan