From: Dieter Wilhelm <dieter@duenenhof-wilhelm.de>
To: 4280@emacsbugs.donarmstrong.com
Subject: bug#4280: 23.1.50; vc-update fails under conflicts
Date: Tue, 01 Sep 2009 00:22:19 +0200 [thread overview]
Message-ID: <87r5ury678.fsf@urmel.duenenhof-wilhelm.de> (raw)
Hi,
strange, at work I built an Emacs 23.1.1 from source and with it
vc-update/vc-merge for svn worked also under conflicts (vc evoked
smerge)! Maybe this is an debian snapshot problem, I'm wondering how
to check this?
But then, there is also no mechanism in vc for svn (or emacs)
resolving the "conflicts" or removing the "conflict files". I think
it would be the most convenient and logical when vc-next-action could
check whether there are "conflict files" and would do something in the
line of "svn resolve FILE" before trying to check in.
Best wishes
Dieter
next reply other threads:[~2009-08-31 22:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-31 22:22 Dieter Wilhelm [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-08-28 5:45 bug#4280: 23.1.50; vc-update fails under conflicts Dieter Wilhelm
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=87r5ury678.fsf@urmel.duenenhof-wilhelm.de \
--to=dieter@duenenhof-wilhelm.de \
--cc=4280@emacsbugs.donarmstrong.com \
/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.