[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: What a modern collaboration toolkit looks like
From: |
Tom Tromey |
Subject: |
Re: What a modern collaboration toolkit looks like |
Date: |
Mon, 21 Jan 2008 12:50:16 -0700 |
User-agent: |
Gnus/5.11 (Gnus v5.11) Emacs/22.0.990 (gnu/linux) |
>>>>> "Stefan" == Stefan Monnier <address@hidden> writes:
>> function. Also I think we will need a "conflict" state.
Stefan> Be careful with this one: some backends allow commits with conflicts
Stefan> (for later resolution). And for many operations, it doesn't matter if
Stefan> a file is locally modified or with a conflict, so in many ways
Stefan> "conflict" is a sub-state of "locally modified".
Thanks.
FWIW I didn't have any clue what particular semantics "conflict"
should imply. I just think that, like pcl-cvs, it is useful to show
this as a separate state in a vc-status buffer.
Tom
Re: What a modern collaboration toolkit looks like, Richard Stallman, 2008/01/21
Re: What a modern collaboration toolkit looks like, Dan Nicolaescu, 2008/01/21
Re: What a modern collaboration toolkit looks like, Mark A. Hershberger, 2008/01/24
Re: What a modern collaboration toolkit looks like, Juanma Barranquero, 2008/01/24
Re: What a modern collaboration toolkit looks like, dhruva, 2008/01/24
Re: What a modern collaboration toolkit looks like, Stephen J. Turnbull, 2008/01/24
Re: What a modern collaboration toolkit looks like, Juanma Barranquero, 2008/01/24
Re: What a modern collaboration toolkit looks like, Richard Stallman, 2008/01/25
Re: What a modern collaboration toolkit looks like, Alfred M. Szmidt, 2008/01/25
Re: What a modern collaboration toolkit looks like, Miles Bader, 2008/01/25
Re: What a modern collaboration toolkit looks like, Richard Stallman, 2008/01/26