/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 bzrlib/changeset/commands.py

  • Committer: Aaron Bentley
  • Date: 2006-05-12 20:52:25 UTC
  • mto: (1185.82.108 w-changeset)
  • mto: This revision was merged to the branch mainline in revision 1738.
  • Revision ID: abentley@panoramicfeedback.com-20060512205225-82ea9c76d3d6b135
Start getting changeset merging under test

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/changeset/commands.py
111
111
            raise errors.BzrCommandError('--revision takes 1 or 2 parameters')
112
112
 
113
113
        if base_revision is None:
114
 
            rev = target_branch.get_revision(target_revision)
 
114
            rev = target_branch.repository.get_revision(target_revision)
115
115
            if rev.parent_ids:
116
116
                base_revision = rev.parent_ids[0]
117
117
            else:
120
120
        if base_branch is not None:
121
121
            fetch(target_branch, base_branch, base_revision)
122
122
            del base_branch
123
 
        revision_id_list = get_intervening_revisions(target_revision, base_revision,
124
 
                target_branch, target_branch.revision_history())
 
123
        revision_id_list = get_intervening_revisions(base_revision,
 
124
                                                     target_revision,
 
125
                                                     target_branch.repository,
 
126
                                             target_branch.revision_history())
125
127
                
126
 
        write(target_branch, revision_id_list, sys.stdout)
 
128
        write(target_branch.repository, revision_id_list, sys.stdout)
127
129
 
128
130
 
129
131
class cmd_verify_changeset(Command):