[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: log format for vc-bzr
From: |
Eli Zaretskii |
Subject: |
Re: log format for vc-bzr |
Date: |
Fri, 08 Jan 2010 18:57:48 +0200 |
> From: Óscar_Fuentes <address@hidden>
> Date: Fri, 08 Jan 2010 14:48:30 +0100
>
> Eli Zaretskii <address@hidden> writes:
>
> >> > --forget-merges
> >> > Remove pending merge marker, without changing any files.
> >> >
> >> > What is a ``pending merge marker''?
> >>
> >> A "pending merge" is a merge that you have started with "bzr merge"
> >> (or perhaps a "bzr pull" that resulted in a conflict) but not yet
> >> finished with "bzr commit".
> >
> > Terrific! So I just did a merge, but it is still considered
> > ``pending''? Who could have thought of a more confusing semantics??
>
> bzr always requires to commit after a merge.
Then the docs should have said "pending uncommitted merge results".
IOW, the fact that there should be a commit after the merge is not the
reason to call the just-performed merge "pending". The results of the
merge are pending commit, but the merge itself is no longer pending,
it was already done.
- Re: log format for vc-bzr, (continued)
- Re: log format for vc-bzr, Stephen J. Turnbull, 2010/01/08
- Re: log format for vc-bzr, Eli Zaretskii, 2010/01/08
- Re: log format for vc-bzr, Juanma Barranquero, 2010/01/08
- Re: log format for vc-bzr, Stephen J. Turnbull, 2010/01/08
- Re: log format for vc-bzr, Eli Zaretskii, 2010/01/09
- Re: log format for vc-bzr, Óscar Fuentes, 2010/01/08
- Re: log format for vc-bzr,
Eli Zaretskii <=
- Re: log format for vc-bzr, Óscar Fuentes, 2010/01/08
- Re: log format for vc-bzr, Eli Zaretskii, 2010/01/08
- Re: log format for vc-bzr, Miles Bader, 2010/01/08
- Re: log format for vc-bzr, Eli Zaretskii, 2010/01/08
- Re: log format for vc-bzr, Óscar Fuentes, 2010/01/08
- Re: log format for vc-bzr, Eli Zaretskii, 2010/01/08
- Re: log format for vc-bzr, Óscar Fuentes, 2010/01/08
- Re: log format for vc-bzr, Eli Zaretskii, 2010/01/08
- Re: log format for vc-bzr, Óscar Fuentes, 2010/01/08
- Re: log format for vc-bzr, Thien-Thi Nguyen, 2010/01/09