From: Dmitry Gutov <dgutov@yandex.ru>
To: Eli Zaretskii <eliz@gnu.org>, Lars Ingebrigtsen <larsi@gnus.org>
Cc: 3860@debbugs.gnu.org, jknight@fuhm.net, spiegel@gnu.org
Subject: bug#3860: vc-svn calls "svn resolved" without permission
Date: Fri, 22 Jan 2021 00:35:07 +0200 [thread overview]
Message-ID: <6b6005b6-6efc-63f1-404d-d07f910281ef@yandex.ru> (raw)
In-Reply-To: <835z3q6q6q.fsf@gnu.org>
On 21.01.2021 21:33, Eli Zaretskii wrote:
> I think if we are going to make this optional with SVN, we should make
> it optional with the other back-ends as well. VC always presented a
> uniform UI and user experience with all back-ends, as far as possible
> and reasonable. In this case, I think automatically marking the
> conflicts as resolved makes a lot of sense, but I won't object to make
> it opt-out, as long as it's done for every VCS that can support it.
So someone might want to generalize the Git-specific variable:
vc-git-resolve-conflicts.
But they'd have to consider what to do with the special value
'unstage-maybe', which doesn't really make sense for other backends.
next prev parent reply other threads:[~2021-01-21 22:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-15 19:43 bug#3860: vc-svn calls "svn resolved" without permission James Y Knight
2021-01-21 16:41 ` Lars Ingebrigtsen
2021-01-21 19:33 ` Eli Zaretskii
2021-01-21 22:35 ` Dmitry Gutov [this message]
2021-01-22 7:29 ` Eli Zaretskii
2021-01-22 17:25 ` Lars Ingebrigtsen
2021-01-24 22:36 ` James Y Knight
2021-01-25 1:57 ` Dmitry Gutov
2021-01-26 0:28 ` Lars Ingebrigtsen
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6b6005b6-6efc-63f1-404d-d07f910281ef@yandex.ru \
--to=dgutov@yandex.ru \
--cc=3860@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=jknight@fuhm.net \
--cc=larsi@gnus.org \
--cc=spiegel@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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).