← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/pack.py

  • Committer: Patch Queue Manager
  • Date: 2011-09-19 15:22:23 UTC
  • mfrom: (6123.11.18 log-omit-merges)
  • Revision ID: pqm@pqm.ubuntu.com-20110919152223-o7lh1428tge31dg1
(jr) Add options --omit-merges and --include-merged for bzr log and missing,
 deprecating --include-merges. (Martin von Gagern)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/pack.py
333
333
                # risk that the same unicode string has been encoded two
334
334
                # different ways.
335
335
                if name_tuple in all_names:
336
 
                    raise errors.DuplicateRecordNameError(name_tuple)
 
336
                    raise errors.DuplicateRecordNameError(name_tuple[0])
337
337
                all_names.add(name_tuple)
338
338
        excess_bytes = self.reader_func(1)
339
339
        if excess_bytes != '':