Rev 4101: (mbp) Better help for bzr send in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Mar 10 02:44:37 GMT 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4101
revision-id: pqm at pqm.ubuntu.com-20090310024432-0g561n9wf23vph9f
parent: pqm at pqm.ubuntu.com-20090310012923-c8el0n6v75v4ycd1
parent: mbp at sourcefrog.net-20090310012257-rvtds5ic7ard4iza
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-03-10 02:44:32 +0000
message:
(mbp) Better help for bzr send
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 4095.2.2
revision-id: mbp at sourcefrog.net-20090310012257-rvtds5ic7ard4iza
parent: mbp at sourcefrog.net-20090310000302-p1g5f9i9xil4s4te
parent: pqm at pqm.ubuntu.com-20090310004923-3gtpq4ned1d6xhoj
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Tue 2009-03-10 11:22:57 +1000
message:
merge news
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/EncodingAdapter.py EncodingAdapter.py-20060113032051-4d7e1d8c1e38b4a1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/inventory_implementations/__init__.py __init__.py-20070821044532-olbadbokgv3qv1yd-1
bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
bzrlib/tests/per_interbranch/__init__.py __init__.py-20090225010018-l7w4uvvt73ea2vj9-1
bzrlib/tests/per_lock/__init__.py __init__.py-20070314201444-u92yjsqrkh2m3qcb-1
bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/test__chunks_to_lines.py test__chunks_to_line-20081211024848-6uc3mtuje8j14l60-2
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_upgrade_stacked.py test_upgrade_stacked-20080804072225-jd13yami19nskns5-1
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
------------------------------------------------------------
revno: 4095.2.1
revision-id: mbp at sourcefrog.net-20090310000302-p1g5f9i9xil4s4te
parent: pqm at pqm.ubuntu.com-20090309052557-ao3zck4ogpqtvvgt
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Tue 2009-03-10 10:03:02 +1000
message:
Better help for bzr send
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'NEWS'
--- a/NEWS 2009-03-10 01:29:23 +0000
+++ b/NEWS 2009-03-10 02:44:32 +0000
@@ -91,6 +91,9 @@
unable to read a file in the working directory, for example because
of a permission error. (Martin Pool, #338653)
+ * ``bzr send`` help is more specific about how to apply merge
+ directives. (Neil Martinsen-Burrell, #253470)
+
* ``bzr missing`` now uses ``Repository.get_revision_delta()`` rather
than fetching trees and determining a delta itself. (Jelmer
Vernooij, #315048)
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2009-03-10 01:29:23 +0000
+++ b/bzrlib/builtins.py 2009-03-10 02:44:32 +0000
@@ -839,7 +839,7 @@
with bzr send.
"""
- _see_also = ['push', 'update', 'status-flags']
+ _see_also = ['push', 'update', 'status-flags', 'send']
takes_options = ['remember', 'overwrite', 'revision',
custom_help('verbose',
help='Show logs of pulled revisions.'),
@@ -3325,7 +3325,7 @@
"""
encoding_type = 'exact'
- _see_also = ['update', 'remerge', 'status-flags']
+ _see_also = ['update', 'remerge', 'status-flags', 'send']
takes_args = ['location?']
takes_options = [
'change',
@@ -4712,7 +4712,8 @@
default. "0.9" uses revision bundle format 0.9 and merge directive
format 1. It is compatible with Bazaar 0.12 - 0.18.
- Merge directives are applied using the merge command or the pull command.
+ The merge directives created by bzr send may be applied using bzr merge or
+ bzr pull by specifying a file containing a merge directive as the location.
"""
encoding_type = 'exact'
More information about the bazaar-commits
mailing list