← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/multiparent.py

  • Committer: Martin von Gagern
  • Date: 2011-06-01 12:53:56 UTC
  • mto: This revision was merged to the branch mainline in revision 6009.
  • Revision ID: martin.vgagern@gmx.net-20110601125356-lwozv2vecea6hxfz
Change from no_decorate to classify as name for the argument.

The command line switch remains as --no-classify, to keep backwards
compatibility.  Users are free to include --no-classify in an alias, and
still use --classify to change back.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/multiparent.py
421
421
                            if not (lines == self.get_line_list([revision])[0]):
422
422
                                raise AssertionError()
423
423
                            self.clear_cache()
424
 
                    pb.update(gettext('Importing revisions'),
 
424
                    pb.update('Importing revisions',
425
425
                              (total - len(revisions)) + len(added), total)
426
426
                revisions = [r for r in revisions if r not in added]
427
427
        finally: