Rev 3314: Improve doc on send/merge relationship (Peter Schuller) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Mar 28 09:04:15 GMT 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3314
revision-id:pqm at pqm.ubuntu.com-20080328090406-vc3xtc517r5z96bp
parent: pqm at pqm.ubuntu.com-20080328064220-ongijg78bfqhvbay
parent: ian.clatworthy at canonical.com-20080328072455-0xlxool8cm4ibem8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-03-28 09:04:06 +0000
message:
Improve doc on send/merge relationship (Peter Schuller)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3313.1.1
revision-id:ian.clatworthy at canonical.com-20080328072455-0xlxool8cm4ibem8
parent: pqm at pqm.ubuntu.com-20080328064220-ongijg78bfqhvbay
parent: peter.schuller at infidyne.com-20080325231229-w8gguy6uy43z0x63
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Fri 2008-03-28 17:24:55 +1000
message:
Improve doc on send/merge relationship (Peter Schuller)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3277.1.4
revision-id:peter.schuller at infidyne.com-20080325231229-w8gguy6uy43z0x63
parent: peter.schuller at infidyne.com-20080316191535-arbxlus1moh3jtif
committer: Peter Schuller <peter.schuller at infidyne.com>
branch nick: bzr.scode
timestamp: Wed 2008-03-26 00:12:29 +0100
message:
As per further feedback, use LOCATION instead of MERGE_OR_MERGE_DIRECTIVE.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3277.1.3
revision-id:peter.schuller at infidyne.com-20080316191535-arbxlus1moh3jtif
parent: peter.schuller at infidyne.com-20080316190548-ok3lx0y4dpgwhqtq
committer: Peter Schuller <peter.schuller at infidyne.com>
branch nick: bzr.scode
timestamp: Sun 2008-03-16 20:15:35 +0100
message:
Identify by name the "cherrypicking" mode of operation of 'bzr merge'.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3277.1.2
revision-id:peter.schuller at infidyne.com-20080316190548-ok3lx0y4dpgwhqtq
parent: peter.schuller at infidyne.com-20080314214745-rcrc2rtxp2w3g2hj
committer: Peter Schuller <peter.schuller at infidyne.com>
branch nick: bzr.scode
timestamp: Sun 2008-03-16 20:05:48 +0100
message:
As per feedback to previous attempt:
- use branch_or_merge_directive instead of branch|merge_directive
- make corresponding changes to run()
- slight phrasing changes, including a bit of the old merge
paragraph that was not changed by the previous attempt
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3277.1.1
revision-id:peter.schuller at infidyne.com-20080314214745-rcrc2rtxp2w3g2hj
parent: pqm at pqm.ubuntu.com-20080314211658-bjlcjsk0zl2ppcai
committer: Peter Schuller <peter.schuller at infidyne.com>
branch nick: bzr.scode
timestamp: Fri 2008-03-14 22:47:45 +0100
message:
Document the relationship between bzr send and bzr merge. In
particular, be explicit about the support for merge directives in the
documentation of the merge command.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'NEWS'
--- a/NEWS 2008-03-28 06:42:20 +0000
+++ b/NEWS 2008-03-28 07:24:55 +0000
@@ -60,6 +60,8 @@
DOCUMENTATION:
+ * Improved documentation on send/merge relationship. (Peter Schuller)
+
* Minor fixes to the User Guide. (Matthew Fuller)
* Reduced the evangelism in the User Guide. (Ian Clatworthy)
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2008-03-24 23:43:51 +0000
+++ b/bzrlib/builtins.py 2008-03-28 07:24:55 +0000
@@ -589,6 +589,10 @@
that, you can omit the location to use the default. To change the
default, use --remember. The value will only be saved if the remote
location can be accessed.
+
+ Note: The location can be specified either in the form of a branch,
+ or in the form of a path to a file containing a merge directive generated
+ with bzr send.
"""
_see_also = ['push', 'update', 'status-flags']
@@ -2763,11 +2767,17 @@
class cmd_merge(Command):
"""Perform a three-way merge.
- The branch is the branch you will merge from. By default, it will merge
- the latest revision. If you specify a revision, that revision will be
- merged. If you specify two revisions, the first will be used as a BASE,
- and the second one as OTHER. Revision numbers are always relative to the
- specified branch.
+ The source of the merge can be specified either in the form of a branch,
+ or in the form of a path to a file containing a merge directive generated
+ with bzr send. If neither is specified, the default is the upstream branch
+ or the branch most recently merged using --remember.
+
+ When merging a branch, by default the tip will be merged. To pick a different
+ revision, pass --revision. If you specify two values, the first will be used as
+ BASE and the second one as OTHER. Merging individual revisions, or a subset of
+ available revisions, like this is commonly referred to as "cherrypicking".
+
+ Revision numbers are always relative to the branch being merged.
By default, bzr will try to merge in all new work from the other
branch, automatically determining an appropriate base. If this
@@ -2804,11 +2814,15 @@
To merge the changes introduced by 82, without previous changes::
bzr merge -r 81..82 ../bzr.dev
+
+ To apply a merge directive contained in in /tmp/merge:
+
+ bzr merge /tmp/merge
"""
encoding_type = 'exact'
_see_also = ['update', 'remerge', 'status-flags']
- takes_args = ['branch?']
+ takes_args = ['location?']
takes_options = [
'change',
'revision',
@@ -2834,16 +2848,12 @@
Option('preview', help='Instead of merging, show a diff of the merge.')
]
- def run(self, branch=None, revision=None, force=False, merge_type=None,
- show_base=False, reprocess=False, remember=False,
+ def run(self, location=None, revision=None, force=False,
+ merge_type=None, show_base=False, reprocess=False, remember=False,
uncommitted=False, pull=False,
directory=None,
preview=False,
):
- # This is actually a branch (or merge-directive) *location*.
- location = branch
- del branch
-
if merge_type is None:
merge_type = _mod_merge.Merge3Merger
@@ -4078,11 +4088,13 @@
older formats. It is compatible with Bazaar 0.19 and later. It is the
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.
"""
encoding_type = 'exact'
- _see_also = ['merge']
+ _see_also = ['merge', 'pull']
takes_args = ['submit_branch?', 'public_branch?']
More information about the bazaar-commits
mailing list