From: "Óscar Fuentes" <ofv@wanadoo.es>
To: emacs-devel@gnu.org
Subject: Re: No commit in vc?
Date: Thu, 28 Jan 2010 20:57:24 +0100 [thread overview]
Message-ID: <873a1qt32z.fsf@telefonica.net> (raw)
In-Reply-To: 83eilat4g7.fsf@gnu.org
Eli Zaretskii <eliz@gnu.org> writes:
> Are you saying that this happened because a "merge" was not followed
> by a "commit", and only because of that?
Jan tried to commit after the merge, but somehow VC-dir passed some
file names to the command instead of doing a non-selective commit as he
intended.
[snip]
>> So it is documented. Maybe VC could detect if there are pending merges
>> parsing the output of `bzr st', or parse the error message returned by
>> `bzr commit somefile' and detect that the failure was due to a pending
>> merge
>
> And then do what?
Report that circumstance to the user?
But probably showing the error msg reported by bzr is enough, and IIRC
VC already does this.
>> What bzr shouldn't do is to output a backtrace. I'll file a bug report
>> for that.
>
> That was a backtrace in .bzr.log, no? What's wrong with that?
Nothing. I checked that the backtrace does not show in the console, so
it is fine.
next prev parent reply other threads:[~2010-01-28 19:57 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
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 [this message]
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=873a1qt32z.fsf@telefonica.net \
--to=ofv@wanadoo.es \
--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.