← 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-27 23:43:15 UTC
  • mfrom: (1185.24.3)
  • mto: (1185.35.8)
  • mto: This revision was merged to the branch mainline in revision 1491.
  • Revision ID: abentley@panoramicfeedback.com-20051027234315-1f51cfe5a0303e31
Merged reprocessing for merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1305
1305
    --force is given.
1306
1306
    """
1307
1307
    takes_args = ['branch?']
1308
 
    takes_options = ['revision', 'force', 'merge-type', 
 
1308
    takes_options = ['revision', 'force', 'merge-type', 'reprocess',
1309
1309
                     Option('show-base', help="Show base revision text in "
1310
1310
                            "conflicts")]
1311
1311
 
1312
1312
    def run(self, branch=None, revision=None, force=False, merge_type=None,
1313
 
            show_base=False):
 
1313
            show_base=False, reprocess=False):
1314
1314
        from bzrlib.merge import merge
1315
1315
        from bzrlib.merge_core import ApplyMerge3
1316
1316
        if merge_type is None:
1342
1342
 
1343
1343
        try:
1344
1344
            conflict_count = merge(other, base, check_clean=(not force),
1345
 
                                   merge_type=merge_type,
 
1345
                                   merge_type=merge_type, reprocess=reprocess,
1346
1346
                                   show_base=show_base)
1347
1347
            if conflict_count != 0:
1348
1348
                return 1