From: Richard M Stallman <rms@gnu.org>
To: nickrob@snap.net.nz (Nick Roberts)
Cc: emacs-devel@gnu.org
Subject: Re: vc-dir with Subversion
Date: Fri, 03 Apr 2009 15:08:11 -0400 [thread overview]
Message-ID: <E1LpokN-0007og-Ni@fencepost.gnu.org> (raw)
In-Reply-To: <18901.49921.885006.143162@totara.tehura.co.nz> (nickrob@snap.net.nz)
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.
next prev parent reply other threads:[~2009-04-03 19:08 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 [this message]
2009-04-03 23:13 ` Nick Roberts
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=E1LpokN-0007og-Ni@fencepost.gnu.org \
--to=rms@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=nickrob@snap.net.nz \
/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.