|
From: | Stefan Monnier |
Subject: | Re: What a modern collaboration toolkit looks like |
Date: | Mon, 21 Jan 2008 15:06:32 -0500 |
User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/23.0.50 (gnu/linux) |
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
[Prev in Thread] | Current Thread | [Next in Thread] |