From: Eli Zaretskii <eliz@gnu.org>
To: help-gnu-emacs@gnu.org
Subject: Re: vc-dir and Bazaar
Date: Sat, 24 Jul 2010 15:21:49 +0300 [thread overview]
Message-ID: <83tynp83z6.fsf@gnu.org> (raw)
In-Reply-To: <8739v9ytx3.fsf@escher.home>
> From: Stephen Berman <stephen.berman@gmx.net>
> Date: Sat, 24 Jul 2010 13:56:56 +0200
>
> > IOW, before you can meaningfully use vc-dir, you need to do something
> > worthy of it ;-) E.g., modify some file.
>
> Ok. So, since my Emacs trunk tree is a mirror of the Savannah trunk and
> I only update it, I can't use vc-dir to do this. Moreover, I can't use
> it to merge the updated files from the trunk to my quickfixes branch.
Right. That's what the "merge-news is not implemented part" is about.
> But once I have merged them from the command line, I can see them vc-dir
> (I just did this and do see them). So now I should be able to commit
> the merged files, right?
Yes.
> I type `M' to mark all the files, then `v', then a log buffer pops,
> I write "Merge from trunk", type `C-c C-c' and get:
>
> "bzr: ERROR: Selected-file commit of merges is not supported yet: files
> ChangeLog, configure, configure.in, lisp/ChangeLog, lisp/play/tetris.el,
> lisp/progmodes/ps-mode.el, src/ChangeLog, src/alloc.c, src/font.c,
> src/frame.c, src/ralloc.c, src/w32menu.c"
>
> Does that mean I can only commit single files?
Yes, but more importantly, you can commit _all_ of the pending merges
if you just don't mark any files. That's what you should do most of
the time anyway, this being a changeset-based VCS, right?
> I think the manual should document these limitations.
The manual doesn't like to mention limitations of a temporary nature,
because they are expected to be solved in some future release. The
manual only mentions limitations that cannot be lifted at all or
without a major programming effort.
next prev parent reply other threads:[~2010-07-24 12:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-23 12:03 vc-dir and Bazaar Stephen Berman
2010-07-23 21:32 ` Óscar Fuentes
2010-07-23 21:45 ` Stephen Berman
2010-07-24 7:47 ` Eli Zaretskii
2010-07-24 11:56 ` Stephen Berman
2010-07-24 12:21 ` Eli Zaretskii [this message]
2010-07-24 16:20 ` Stephen Berman
2010-07-24 16:52 ` Eli Zaretskii
2010-07-29 13:33 ` Stephen Berman
2010-07-24 15:32 ` Óscar Fuentes
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=83tynp83z6.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=help-gnu-emacs@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.