2191
2191
:Tips & tricks:
2193
2193
GUI tools and IDEs are often better at exploring history than command
2194
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2194
line tools. You may prefer qlog or viz from the QBzr and Bzr-Gtk packages
2195
2195
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2196
2196
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2609
2609
After adding, editing or deleting that file either indirectly by
2610
2610
using this command or directly by using an editor, be sure to commit
2613
Patterns prefixed with '!' are exceptions to ignore patterns and take
2614
precedence over regular ignores. Such exceptions are used to specify
2615
files that should be versioned which would otherwise be ignored.
2617
Patterns prefixed with '!!' act as regular ignore patterns, but have
2618
precedence over the '!' exception patterns.
2613
2620
Note: ignore patterns containing shell wildcards must be quoted from
2614
2621
the shell on Unix.
2619
2626
bzr ignore ./Makefile
2621
Ignore class files in all directories::
2628
Ignore .class files in all directories...::
2623
2630
bzr ignore "*.class"
2632
...but do not ignore "special.class"::
2634
bzr ignore "!special.class"
2625
2636
Ignore .o files under the lib directory::
2627
2638
bzr ignore "lib/**/*.o"
2633
2644
Ignore everything but the "debian" toplevel directory::
2635
2646
bzr ignore "RE:(?!debian/).*"
2648
Ignore everything except the "local" toplevel directory,
2649
but always ignore "*~" autosave files, even under local/::
2652
bzr ignore "!./local"
2638
2656
_see_also = ['status', 'ignored', 'patterns']
3647
3665
committed to record the result of the merge.
3649
3667
merge refuses to run if there are any uncommitted changes, unless
3668
--force is given. The --force option can also be used to create a
3669
merge revision which has more than two parents.
3671
If one would like to merge changes from the working tree of the other
3672
branch without merging any committed revisions, the --uncommitted option
3652
3675
To select only some changes to merge, use "merge -i", which will prompt
3653
3676
you to apply each diff hunk and file change, similar to "shelve".
4083
4113
created as above. Directories containing unknown files will not be
4086
The working tree contains a list of pending merged revisions, which will
4087
be included as parents in the next commit. Normally, revert clears that
4088
list as well as reverting the files. If any files are specified, revert
4089
leaves the pending merge list alone and reverts only the files. Use "bzr
4090
revert ." in the tree root to revert all files but keep the merge record,
4091
and "bzr revert --forget-merges" to clear the pending merge list without
4116
The working tree contains a list of revisions that have been merged but
4117
not yet committed. These revisions will be included as additional parents
4118
of the next commit. Normally, using revert clears that list as well as
4119
reverting the files. If any files are specified, revert leaves the list
4120
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4121
.`` in the tree root to revert all files but keep the recorded merges,
4122
and ``bzr revert --forget-merges`` to clear the pending merge list without
4092
4123
reverting any files.
4094
Using "bzr revert --forget-merges", it is possible to apply the changes
4095
from an arbitrary merge as a single revision. To do this, perform the
4096
merge as desired. Then doing revert with the "--forget-merges" option will
4097
keep the content of the tree as it was, but it will clear the list of
4098
pending merges. The next commit will then contain all of the changes that
4099
would have been in the merge, but without any mention of the other parent
4100
revisions. Because this technique forgets where these changes originated,
4101
it may cause additional conflicts on later merges involving the source and
4125
Using "bzr revert --forget-merges", it is possible to apply all of the
4126
changes from a branch in a single revision. To do this, perform the merge
4127
as desired. Then doing revert with the "--forget-merges" option will keep
4128
the content of the tree as it was, but it will clear the list of pending
4129
merges. The next commit will then contain all of the changes that are
4130
present in the other branch, but without any other parent revisions.
4131
Because this technique forgets where these changes originated, it may
4132
cause additional conflicts on later merges involving the same source and
4102
4133
target branches.
added
removed
bzrlib/builtins.py
