[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: log format for vc-bzr
From: |
Daniel Clemente |
Subject: |
Re: log format for vc-bzr |
Date: |
Fri, 08 Jan 2010 12:54:03 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) |
El vie, ene 08 2010 a les 10:00, Eli Zaretskii va escriure:
> As usual, the Bazaar documentation doesn't say anything about this
> option that can be grokked by Bazaar non-experts.
>
It does. See the 2 last paragraphs of bzr help revert:
,----
| The working tree contains a list of pending merged revisions, which will
| be included as parents in the next commit. Normally, revert clears that
| list as well as reverting the files. If any files are specified, revert
| leaves the pending merge list alone and reverts only the files. Use "bzr
| revert ." in the tree root to revert all files but keep the merge record,
| and "bzr revert --forget-merges" to clear the pending merge list without
| reverting any files.
|
| Using "bzr revert --forget-merges", it is possible to apply the changes
| from an arbitrary merge as a single revision. To do this, perform the
| merge as desired. Then doing revert with the "--forget-merges" option will
| keep the content of the tree as it was, but it will clear the list of
| pending merges. The next commit will then contain all of the changes that
| would have been in the merge, but without any mention of the other parent
| revisions. Because this technique forgets where these changes originated,
| it may cause additional conflicts on later merges involving the source and
| target branches.
`----
- Re: log format for vc-bzr, (continued)
- 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
- Re: log format for vc-bzr, Andreas Schwab, 2010/01/09
- Re: log format for vc-bzr, Thien-Thi Nguyen, 2010/01/09
- Re: log format for vc-bzr, Miles Bader, 2010/01/08
- Re: log format for vc-bzr,
Daniel Clemente <=
- Re: log format for vc-bzr, Eli Zaretskii, 2010/01/08
- Re: log format for vc-bzr, Daniel Clemente, 2010/01/08
- Re: log format for vc-bzr, Eli Zaretskii, 2010/01/09