unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: "Jan Djärv" <jan.h.d@swipnet.se>
To: "Óscar Fuentes" <ofv@wanadoo.es>
Cc: emacs-devel@gnu.org
Subject: Re: No commit in vc?
Date: Thu, 28 Jan 2010 15:57:02 +0100	[thread overview]
Message-ID: <4B61A5BE.5050207@swipnet.se> (raw)
In-Reply-To: <87vdemtk4g.fsf@telefonica.net>

Óscar Fuentes skrev:
> Jan Djärv <jan.h.d@swipnet.se> writes:
> 
>> Óscar Fuentes skrev:
>>> Jan Djärv <jan.h.d@swipnet.se> writes:
>>>
>>>> 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).
>>> Let me guess:
>>>
>>> bzr merge
>>> <hack hack>
>>> bzr commit foo.c
>>> <cannot do single file commits for merges>
>> No.  I used vc from inside Emacs.  vc did a commit according to
>> .bzr-log.  I never commited a single file.
> 
> Well, I was trying to describe on terms of bzr commands what you VC did
> at your request. After reading your other messages, I guess that this is
> what happened:
> 
> cd trunk
> bzr merge ../other-branch
> <in VC-dir, mark the modified files>
> <commit from VC-dir>
> 
> As mentioned on my response to Jason, it seems that bzr does not admit a
> `commit' comand with a list of files when there is a pending merge. The
> solution for this is to not mark files in VC-dir, but put the point on
> the `./' entry at the top and press `v' there. This commits all changes
> on the current working tree, which keeps bzr happy.
> 
> 


I didn't mark any files.   Probably vc takes that to mean the same as marking 
edited files.  This is a bug in vc that it tries to check in individual files.

	Jan D.







  reply	other threads:[~2010-01-28 14: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 [this message]
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

  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=4B61A5BE.5050207@swipnet.se \
    --to=jan.h.d@swipnet.se \
    --cc=emacs-devel@gnu.org \
    --cc=ofv@wanadoo.es \
    /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).