[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: vc-dir and Bazaar

From: Stephen Berman
Subject: Re: vc-dir and Bazaar
Date: Sat, 24 Jul 2010 18:20:02 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux)

On Sat, 24 Jul 2010 15:21:49 +0300 Eli Zaretskii <address@hidden> wrote:

>> From: Stephen Berman <address@hidden>
>> 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.

Why "merge-news" instead of simply "merge"?  Is there a difference?  The
former term sounds strange and is confusing in a UI error message.

>> 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,, 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?

Ah, thanks, I somehow overlooked this in the doc string.  That did what
I wanted; but after it executed, I got this message:
"vc-do-command: Running bzr status admin/nt/makedist.bat...FAILED
(status 3)" and the *vc-dir* buffer showed all the files as uncommitted
that it displayed before I had type `v'.  But when I refreshed the
buffer, it showed only the directories.  And when I tried to commit the
merged files from the command line, it said there were no changes to
commit.  So `v' worked in vc-dir despite the error message and the
non-updated display.  Should I report a bug about that?

>> 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.

That's reasonable; yet reading that VC supports Bazaar does lead one to
expect full support...

Thanks for the feedback.

Steve Berman

reply via email to

[Prev in Thread] Current Thread [Next in Thread]