/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/help_topics/en/location-alias.txt

  • Committer: Vincent Ladeuil
  • Date: 2010-01-20 16:05:28 UTC
  • mto: (4973.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4975.
  • Revision ID: v.ladeuil+lp@free.fr-20100120160528-5yo3fbggdp07eovc
Finish the patch based on reviews.

* bzrlib/tests/per_merger.py:
Fix line too long and spurious spaces.

* bzrlib/plugins/news_merge/tests/test_news_merge.py:
(TestFilenameMatchesConfig): Ensure that the params get updated.

* bzrlib/plugins/news_merge/__init__.py:
(filename_matches_config): Save the relevant config variable in
the hook params.
(install_hook): Wrap the hook installation so we can reuse it for
tests.

* bzrlib/plugins/news_merge/README: 
Update the instructions by pointing to the plugin help.

* bzrlib/merge.py:
(MergeHookParams): Delete spurious spaces.

* bzrlib/decorators.py:
(use_pretty_decorators): Mention that we get clearance to copy
launchpad code here (since canonical has copyrights on both code
bases).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/help_topics/en/location-alias.txt
1
 
Location aliases
2
 
================
3
 
 
4
 
Bazaar defines several aliases for locations associated with a branch.  These
5
 
can be used with most commands that expect a location, such as `bzr push`.
6
 
 
7
 
The aliases are::
8
 
 
9
 
  :parent    the parent of this branch
10
 
  :submit    the submit branch for this branch
11
 
  :public    the public location of this branch
12
 
  :bound     the branch this branch is bound to, for bound branches
13
 
  :push      the saved location used for `bzr push` with no arguments
14
 
  :this      this branch
15
 
 
16
 
For example, to push to the parent location::
17
 
 
18
 
    bzr push :parent
19