From: "Jan Djärv" <jan.h.d@swipnet.se>
To: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: No commit in vc?
Date: Thu, 28 Jan 2010 09:09:50 +0100 [thread overview]
Message-ID: <4B61464E.7020008@swipnet.se> (raw)
In-Reply-To: <E1NaP94-000156-7e@fencepost.gnu.org>
Eli Zaretskii skrev:
>> Date: Thu, 28 Jan 2010 08:25:47 +0100
>> From: Jan Djärv <jan.h.d@swipnet.se>
>>
>> Maybe I'm missing something obvious, but I can't find any way of doing commit
>> from vc in Emacs (for bzr).
>>
>> I did what "Doing Quick Fixes" says in BzrForEmacsDevs. I then did C-x v d
>> ..., and then v, <type comment> C-c C-c.
>>
>> Bzr then complains it can't do single file commits for merges (whatever that
>> means).
>
> Can you show what bzr commands are invoked by VC when you type C-x v d
> and C-c C-c?
>
Here is the part from .bzr-log, the exact error message I got was
"Selected-file commit of merges is not supported yet: files src/xfns.c". It
is at the bottom. It looks like it is doing a commit.
tor 2010-01-28 08:12:28 +0100
0.027 bzr arguments: [u'commit', u'-m', u'Revert code for bug #3643.\nxfns.c
(Fx_create_frame): Remove window size matching code
from\n2010-01-15.\n(x_get_current_desktop, x_get_desktop_workarea): Remove\n',
u'xfns.c']
0.041 looking for plugins in /home/jhd/.bazaar/plugins
0.041 looking for plugins in /usr/lib/python2.6/dist-packages/bzrlib/plugins
0.143 encoding stdout as osutils.get_user_encoding() 'UTF-8'
0.206 opening working tree '/home/jhd/src/emacs/trunk'
0.305 ssh implementation is OpenSSH
12.322 preparing to commit
26.054 Traceback (most recent call last):
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 842, in
exception_to_return_code
return the_callable(*args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1037, in
run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 654, in
run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 3058, in run
exclude=safe_relpath_files(tree, exclude))
File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 192, in
write_locked
result = unbound(self, *args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/workingtree_4.py", line 197,
in commit
result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 192, in
write_locked
result = unbound(self, *args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/mutabletree.py", line 229, in
commit
*args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/commit.py", line 339, in commit
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
CannotCommitSelectedFileMerge: Selected-file commit of merges is not supported
yet: files src/xfns.c
26.054 return code 3
Jan D.
next prev parent reply other threads:[~2010-01-28 8:09 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-28 7:25 No commit in vc? Jan Djärv
2010-01-28 7:50 ` Eli Zaretskii
2010-01-28 8:09 ` Jan Djärv [this message]
2010-01-28 11:35 ` Eli Zaretskii
2010-01-28 12:59 ` Jan Djärv
2010-01-28 13:02 ` Jan Djärv
2010-01-28 11:26 ` Óscar Fuentes
2010-01-28 13:01 ` Jan Djärv
2010-01-28 13:22 ` Jason Rumney
2010-01-28 13:43 ` Óscar Fuentes
2010-01-28 13:49 ` Óscar Fuentes
2010-01-28 14:57 ` Jan Djärv
2010-01-28 15:05 ` Óscar Fuentes
2010-01-28 16:26 ` Jan Djärv
2010-01-28 16:44 ` Óscar Fuentes
2010-01-28 19:07 ` Jan Djärv
2010-01-28 18:21 ` Eli Zaretskii
2010-01-28 19:14 ` Jan Djärv
2010-01-28 19:44 ` Dan Nicolaescu
2010-01-28 20:24 ` Eli Zaretskii
2010-01-28 18:32 ` Eli Zaretskii
2010-01-28 18:52 ` Óscar Fuentes
2010-01-28 19:27 ` Eli Zaretskii
2010-01-28 19:57 ` Óscar Fuentes
2010-01-28 20:56 ` Eli Zaretskii
2010-01-29 2:00 ` Dan Nicolaescu
2010-01-29 9:11 ` Eli Zaretskii
2010-01-29 9:40 ` Dan Nicolaescu
2010-01-29 10:48 ` Óscar Fuentes
2010-01-29 11:02 ` Eli Zaretskii
2010-01-29 12:05 ` Óscar Fuentes
2010-01-29 17:29 ` Dan Nicolaescu
2010-01-29 18:29 ` Óscar Fuentes
2010-01-29 19:56 ` Eli Zaretskii
2010-01-30 15:52 ` Thien-Thi Nguyen
2010-01-30 16:44 ` Eli Zaretskii
2010-01-30 19:02 ` Thien-Thi Nguyen
2010-01-30 21:28 ` Eli Zaretskii
2010-01-30 22:07 ` Thien-Thi Nguyen
2010-01-31 15:00 ` Stefan Monnier
2010-01-31 16:02 ` Thien-Thi Nguyen
2010-01-31 16:40 ` David De La Harpe Golden
2010-01-31 22:44 ` Stefan Monnier
2010-02-01 4:34 ` Dan Nicolaescu
2010-02-01 13:07 ` Thien-Thi Nguyen
2010-02-01 15:44 ` Stefan Monnier
2010-01-30 19:49 ` Dan Nicolaescu
2010-01-30 21:35 ` Eli Zaretskii
2010-01-30 22:54 ` Juri Linkov
2010-02-01 4:31 ` Dan Nicolaescu
2010-02-01 10:42 ` Juri Linkov
2010-02-01 19:17 ` Dan Nicolaescu
2010-02-02 22:47 ` Juri Linkov
2010-02-05 4:12 ` Chong Yidong
2010-02-05 5:07 ` Dan Nicolaescu
2010-02-05 8:44 ` Eli Zaretskii
2010-02-05 21:28 ` Juri Linkov
2010-01-29 10:50 ` Eli Zaretskii
2010-01-30 22:52 ` Juri Linkov
2010-01-31 4:18 ` Eli Zaretskii
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=4B61464E.7020008@swipnet.se \
--to=jan.h.d@swipnet.se \
--cc=eliz@gnu.org \
--cc=emacs-devel@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 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.