Re: No commit in vc?

[Eli Zaretskii]

> Date: Fri, 29 Jan 2010 01:40:00 -0800 (PST)
> From: Dan Nicolaescu <address@hidden>
> Cc: address@hidden, address@hidden
> 
> Eli Zaretskii <address@hidden> writes:
> 
>   > > Date: Thu, 28 Jan 2010 18:00:00 -0800 (PST)
>   > > From: Dan Nicolaescu <address@hidden>
>   > > Cc: Óscar Fuentes <address@hidden>, address@hidden
>   > > 
>   > >   > And the merge was done from VC or from the command line?  If the
>   > >   > former, perhaps VC should suggest a commit right after the merge, 
> and
>   > >   > then do it without paying attention to point position.
>   > > 
>   > > I am not sure that's easy/good/feasible.
>   > > 
>   > > Can this condition be detected somehow?
>   > 
>   > You mean, the condition that there are pending uncommitted merges?
> 
> Yep

Seems like one of these will do:

 . "bzr status" says, among other things, "pending merge tips"

 . "bzr status -v" shows all the pending merges, 1 line per merge.

 . "bzr status -S" shows the pending merges in a shorter format.

Note that "bzr status FILE1 FILE2 ...", i.e. if you name some files
explicitly, does not show the pending merges, even if those files are
part of the uncommitted revisions merged from the other branch.

Here're the examples:

    address@hidden:~/bzr/emacs/bidi$ bzr status
    modified:
      admin/notes/bugtracker
      doc/lispref/ChangeLog
      doc/lispref/display.texi
      ...
      src/xfns.c
    unknown:
      src/TAGS-LISP
    pending merge tips: (use -v to see all merge revisions) <<<<<<<<<<<
      Glenn Morris 2010-01-28 Explain mbox folder links.

    address@hidden:~/bzr/emacs/bidi$ bzr status -v
    modified:
      admin/notes/bugtracker
      doc/lispref/ChangeLog
      doc/lispref/display.texi
      ...
      src/xfns.c
    unknown:
      src/TAGS-LISP
    pending merges:   <<<<<<<<<<<<<<<<<<<<<<<<<
      Glenn Morris 2010-01-28 Explain mbox folder links.
        Stefan Monnier 2010-01-28 Fix up spurious execute-bit on net/tramp.el
        Michael Albinus 2010-01-28 * net/ange-ftp.el 
(ange-ftp-insert-directory)...
        Chong Yidong 2010-01-28 * arc-mode.el (archive-zip-extract): Quote the 
a...
        ...
        Chong Yidong 2010-01-25 Fix erc reconnection via non-default connectors 
...
    address@hidden:~/bzr/emacs/bidi$

    address@hidden:~/bzr/emacs/bidi$ bzr status -S
     M  admin/notes/bugtracker
     M  doc/lispref/ChangeLog
     M  doc/lispref/display.texi
     ...
     M  src/m/mips.h
    P   Glenn Morris 2010-01-28 Explain mbox folder links.  <<<<<<<<<<<<