From: nickrob@snap.net.nz (Nick Roberts)
To: rms@gnu.org
Cc: emacs-devel@gnu.org
Subject: Re: vc-dir with Subversion
Date: Sat, 4 Apr 2009 12:13:09 +1300 [thread overview]
Message-ID: <18902.38917.199665.733866@totara.tehura.co.nz> (raw)
In-Reply-To: <E1LpokN-0007og-Ni@fencepost.gnu.org>
Richard M Stallman writes:
> 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?
vc-dir with CVS doesn't recognise the first case and just reports the state
as `needs-merge'. That's because it uses the command `cvs status' which
doesn't report that therre will be a conflict (it gives "Status: Needs Patch"
in this case. Interestingly "cvs -n up" does recognise there would be a
conflict in it's output (with the letter `C').
> 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.
It is case 2. I didn't consider CVS in my e-mail, but I think it would be
more logical to change that case (CVS) to `conflicted'.
next prev parent reply other threads:[~2009-04-03 23:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-03 8:04 vc-dir with Subversion Nick Roberts
2009-04-03 19:08 ` Richard M Stallman
2009-04-03 23:13 ` Nick Roberts [this message]
2009-04-03 19:21 ` Chong Yidong
2009-04-03 23:18 ` Nick Roberts
-- strict thread matches above, loose matches on Subject: below --
2008-08-05 7:44 Nick Roberts
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=18902.38917.199665.733866@totara.tehura.co.nz \
--to=nickrob@snap.net.nz \
--cc=emacs-devel@gnu.org \
--cc=rms@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.