← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2005-10-19 02:40:58 UTC
  • mto: (1185.19.1)
  • mto: This revision was merged to the branch mainline in revision 1474.
  • Revision ID: aaron.bentley@utoronto.ca-20051019024058-4562b385778ee490
Added --show-base to merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1269
1269
    --force is given.
1270
1270
    """
1271
1271
    takes_args = ['branch?']
1272
 
    takes_options = ['revision', 'force', 'merge-type']
 
1272
    takes_options = ['revision', 'force', 'merge-type', 
 
1273
                     Option('show-base', help="Show base revision text in "
 
1274
                            "conflicts")]
1273
1275
 
1274
 
    def run(self, branch=None, revision=None, force=False, 
1275
 
            merge_type=None):
 
1276
    def run(self, branch=None, revision=None, force=False, merge_type=None,
 
1277
            show_base=False):
1276
1278
        from bzrlib.merge import merge
1277
1279
        from bzrlib.merge_core import ApplyMerge3
1278
1280
        if merge_type is None:
1303
1305
                other = [branch, revision[1].in_history(b).revno]
1304
1306
 
1305
1307
        try:
1306
 
            merge(other, base, check_clean=(not force), merge_type=merge_type)
 
1308
            merge(other, base, check_clean=(not force), merge_type=merge_type,
 
1309
                  show_base=show_base)
1307
1310
        except bzrlib.errors.AmbiguousBase, e:
1308
1311
            m = ("sorry, bzr can't determine the right merge base yet\n"
1309
1312
                 "candidates are:\n  "