[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: log format for vc-bzr
From: |
Juanma Barranquero |
Subject: |
Re: log format for vc-bzr |
Date: |
Fri, 8 Jan 2010 13:29:29 +0100 |
On Fri, Jan 8, 2010 at 13:20, Eli Zaretskii <address@hidden> wrote:
>> By removing the pointer to the parents in the microbranch along with
>> the merge marker, the history (metadata) recorded in the microbranch
>> becomes inaccessible (in Lisp terms, garbage).
>
> What is a microbranch?
The history of a branch that gets committed with a merge; the history
you get with "log -n0" for merge commits.
> So it's a way to pretend that a series of changes on a branch is a
> single change that brings you to the last revision on that branch, is
> that right?
If you do merge followed by revert --pending-merges, yes. You can
selectively choose changes with "merge -c".
> "revert --forget-merges"
> forgets the whole commit, not just its commit message, so it seems to
> throw out the baby with the bathwater.
Again, it "forgets" the commits (in the original branch), but you
don't have to do it all at once.
Juanma
- Re: log format for vc-bzr, (continued)
- Re: log format for vc-bzr, Thien-Thi Nguyen, 2010/01/08
- bzr Q&A [was Re: log format for vc-bzr], Glenn Morris, 2010/01/08
- Re: bzr Q&A [was Re: log format for vc-bzr], Eli Zaretskii, 2010/01/09
- bzr Q&A [was Re: log format for vc-bzr], Stephen J. Turnbull, 2010/01/09
- 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 <=
- 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, 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, 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