[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: No commit in vc?
From: |
Óscar Fuentes |
Subject: |
Re: No commit in vc? |
Date: |
Fri, 29 Jan 2010 11:48:00 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) |
Dan Nicolaescu <address@hidden> writes:
> > > > 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? Or
>
> Yep
`bzr st' tells you:
removed:
admin/revdiff
modified:
.bzrignore
ChangeLog
admin/ChangeLog
[...some output elided...]
pending merge tips: (use -v to see all merge revisions)
Chong Yidong 2010-01-28 * fileio.c (Frename_file): Fix last change (Bug#5487).
or the short version, `bzr st -S' :
M .bzrignore
M ChangeLog
M configure
M configure.in
[...some output elided...]
P Chong Yidong 2010-01-28 * fileio.c (Frename_file): Fix last change
(Bug#5487).
Maybe it is a good idea to display the condition that there are pending
merges (after all, you get that information along with the rest of the
working tree state.) IMHO it is not a good idea to change VC-dir's
behavior wrt point position for that state.
- Re: No commit in vc?, (continued)
- Re: No commit in vc?, Dan Nicolaescu, 2010/01/28
- Re: No commit in vc?, Eli Zaretskii, 2010/01/28
- Re: No commit in vc?, Eli Zaretskii, 2010/01/28
- Re: No commit in vc?, Óscar Fuentes, 2010/01/28
- Re: No commit in vc?, Eli Zaretskii, 2010/01/28
- Re: No commit in vc?, Óscar Fuentes, 2010/01/28
- Re: No commit in vc?, Eli Zaretskii, 2010/01/28
- Re: No commit in vc?, Dan Nicolaescu, 2010/01/28
- Re: No commit in vc?, Eli Zaretskii, 2010/01/29
- Re: No commit in vc?, Dan Nicolaescu, 2010/01/29
- Re: No commit in vc?,
Óscar Fuentes <=
- Re: No commit in vc?, Eli Zaretskii, 2010/01/29
- Re: No commit in vc?, Óscar Fuentes, 2010/01/29
- Re: No commit in vc?, Dan Nicolaescu, 2010/01/29
- Re: No commit in vc?, Óscar Fuentes, 2010/01/29
- Re: No commit in vc?, Eli Zaretskii, 2010/01/29
- Re: No commit in vc?, Thien-Thi Nguyen, 2010/01/30
- Re: No commit in vc?, Eli Zaretskii, 2010/01/30
- Re: No commit in vc?, Thien-Thi Nguyen, 2010/01/30
- Re: No commit in vc?, Eli Zaretskii, 2010/01/30
- Re: No commit in vc?, Thien-Thi Nguyen, 2010/01/31