From: James Y Knight <jknight@fuhm.net>
To: spiegel@gnu.org, bug-gnu-emacs@gnu.org
Subject: bug#3860: vc-svn calls "svn resolved" without permission
Date: Wed, 15 Jul 2009 15:43:06 -0400 [thread overview]
Message-ID: <DF0D6AAB-D0C4-4846-AF6B-1AC9586F8A95@fuhm.net> (raw)
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 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!
There's a reason that svn makes you run "svn resolved" on files to
note them as resolved instead of just checking for the lack of
conflict markers, and vc-svn is totally destroying that nice behavior
of svn. If it was a good idea to autoresolve when there's no conflict
marker in the file, then "svn commit" would already do that!
IMO, the function "vc-svn-resolve-when-done" should just be removed
entirely. But if not, it really should *at least* be asking for
confirmation first before causing the merge working data to be deleted.
Relatedly, it would also be great if there was a key to run svn
resolved. I've had this addition in my .emacs for a while to achieve
that:
(defun svn-resolved ()
"Resolve conflict on current buffer"
(interactive)
(shell-command (concat "svn resolved " (buffer-file-name))))
(define-key 'vc-prefix-map "R" 'svn-resolved)
James
next reply other threads:[~2009-07-15 19:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-15 19:43 James Y Knight [this message]
2021-01-21 16:41 ` bug#3860: vc-svn calls "svn resolved" without permission Lars Ingebrigtsen
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=DF0D6AAB-D0C4-4846-AF6B-1AC9586F8A95@fuhm.net \
--to=jknight@fuhm.net \
--cc=3860@emacsbugs.donarmstrong.com \
--cc=bug-gnu-emacs@gnu.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).