/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to processors/generic_processor.py

  • Committer: Jelmer Vernooij
  • Date: 2010-12-11 21:28:37 UTC
  • mto: (0.64.294 trunk)
  • mto: This revision was merged to the branch mainline in revision 6631.
  • Revision ID: jelmer@samba.org-20101211212837-6fb2awmv7ax1lr41
Merge trivial patch from Gabriel Filion to cope with API changes for
reading marks files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
processors/generic_processor.py
154
154
        if self.params.get("import-marks") is not None:
155
155
            mark_info = marks_file.import_marks(self.params.get("import-marks"))
156
156
            if mark_info is not None:
157
 
                self.cache_mgr.revision_ids = mark_info[0]
 
157
                self.cache_mgr.revision_ids = mark_info
158
158
            self.skip_total = False
159
159
            self.first_incremental_commit = True
160
160
        else: