From: Lars Ingebrigtsen <larsi@gnus.org>
To: James Y Knight <jknight@fuhm.net>
Cc: 3860@debbugs.gnu.org, spiegel@gnu.org
Subject: bug#3860: vc-svn calls "svn resolved" without permission
Date: Thu, 21 Jan 2021 17:41:08 +0100 [thread overview]
Message-ID: <87k0s66y57.fsf@gnus.org> (raw)
In-Reply-To: <DF0D6AAB-D0C4-4846-AF6B-1AC9586F8A95@fuhm.net> (James Y. Knight's message of "Wed, 15 Jul 2009 15:43:06 -0400")
James Y Knight <jknight@fuhm.net> writes:
> Hi, I recently just switched to from Emacs 21 to Emacs 22 (22.2.1, on
> Debian Lenny), and was a bit disappointed to discover that vc-svn is
> now automatically calling "svn resolved" on files when I save them
> after removing conflict markers.
(I'm going through old bug reports that unfortunately got no response at
the time.)
This behaviour still seems to be present in Emacs 28, as far as I can
see.
> I use svn's list of conflicted files while working on merges, and tend
> to only call "resolved" on them when I'm *actually done* fixing a
> group of files. I'll note that emacs automatically calling "svn
> resolved" also destroys the .mine, .rOLD, and .rNEW files, which I
> wasn't actually done with yet. Having them disappear out from under me
> just because I've *partly* fixed things and saved is very
> counterintuitive!
I haven't used SVN myself in ages, and I don't even recall what my work
flow used to be. However, adding a variable to suppress
`vc-svn-resolve-when-done' might make sense? Anybody who actually uses
SVN still got an opinion here?
That this bug report is 11 years old and there doesn't seem to be any
other bug reports about this does perhaps indicate that people are fine
with how it works, and nothing should be done here.
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no
next prev parent reply other threads:[~2021-01-21 16:41 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 [this message]
2021-01-21 19:33 ` Eli Zaretskii
2021-01-21 22:35 ` Dmitry Gutov
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=87k0s66y57.fsf@gnus.org \
--to=larsi@gnus.org \
--cc=3860@debbugs.gnu.org \
--cc=jknight@fuhm.net \
--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).