[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: vc-dir with Subversion
From: |
Richard M Stallman |
Subject: |
Re: vc-dir with Subversion |
Date: |
Fri, 03 Apr 2009 15:08:11 -0400 |
1) Prior to updating.
2) After updating.
but labels the status with the keyword `conflict' in both cases. In the
latter case all other keywords use the past tense: removed, edited,
unregistered etc. To avoid confusion I suggest that we use the keyword
`conflicted' for this case. The patch below does this.
The difference between "conflict" and "conflicted" is small.
If this distinction is important, I think it is important to make
it more prominent.
Which of these two cases is a CVS conflict similar to?
I think it is case 2, that a conflict in CVS is reported
after updating. If that is true, it seems to me that case 2
should be described with "conflict" and case 1 should have
some other name.