~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/builtins.py

Including a discussion of revert --forget-merges as a tool for
advanced merging. (Neil Martinsen-Burrell, #190096)

added added

removed removed

4085

revert ." in the tree root to revert all files but keep the merge record,

4086

and "bzr revert --forget-merges" to clear the pending merge list without

4087

reverting any files.

4088

4089

Using "bzr revert --forget-merges", it is possible to apply the changes

4090

from an arbitrary merge as a single revision. To do this, perform the

4091

merge as desired. Then doing revert with the "--forget-merges" option will

4092

keep the content of the tree as it was, but it will clear the list of

4093

pending merges. The next commit will then contain all of the changes that

4094

would have been in the merge, but without any mention of the other parent

4095

revisions. Because this technique forgets where these changes originated,

4096

it may cause additional conflicts on later merges involving the source and

4097

target branches.

4088

4098

"""

4089

4099

4090

4100

_see_also = ['cat', 'export']