/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/builtins.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
235
235
            revs.extend(revision)
236
236
        if revision_info_list is not None:
237
237
            for rev in revision_info_list:
238
 
                revs.append(RevisionSpec(rev))
 
238
                revs.append(RevisionSpec.from_string(rev))
239
239
        if len(revs) == 0:
240
240
            raise BzrCommandError('You must supply a revision identifier')
241
241
 
822
822
    def run(self, dir='.'):
823
823
        tree = WorkingTree.open_containing(dir)[0]
824
824
        tree.lock_write()
825
 
        existing_pending_merges = tree.pending_merges()
826
825
        try:
827
 
            last_rev = tree.last_revision() 
 
826
            existing_pending_merges = tree.pending_merges()
 
827
            last_rev = tree.last_revision()
828
828
            if last_rev == tree.branch.last_revision():
829
829
                # may be up to date, check master too.
830
830
                master = tree.branch.get_master_branch()
2250
2250
        tree, file_list = tree_files(file_list)
2251
2251
        tree.lock_write()
2252
2252
        try:
2253
 
            pending_merges = tree.pending_merges() 
2254
 
            if len(pending_merges) != 1:
 
2253
            parents = tree.get_parent_ids()
 
2254
            if len(parents) != 2:
2255
2255
                raise BzrCommandError("Sorry, remerge only works after normal"
2256
2256
                                      " merges.  Not cherrypicking or"
2257
2257
                                      " multi-merges.")
2258
2258
            repository = tree.branch.repository
2259
 
            base_revision = common_ancestor(tree.branch.last_revision(), 
2260
 
                                            pending_merges[0], repository)
 
2259
            base_revision = common_ancestor(parents[0],
 
2260
                                            parents[1], repository)
2261
2261
            base_tree = repository.revision_tree(base_revision)
2262
 
            other_tree = repository.revision_tree(pending_merges[0])
 
2262
            other_tree = repository.revision_tree(parents[1])
2263
2263
            interesting_ids = None
2264
2264
            new_conflicts = []
2265
2265
            conflicts = tree.conflicts()
2289
2289
                    pass
2290
2290
            conflicts = merge_inner(tree.branch, other_tree, base_tree,
2291
2291
                                    this_tree=tree,
2292
 
                                    interesting_ids=interesting_ids, 
2293
 
                                    other_rev_id=pending_merges[0], 
2294
 
                                    merge_type=merge_type, 
 
2292
                                    interesting_ids=interesting_ids,
 
2293
                                    other_rev_id=parents[1],
 
2294
                                    merge_type=merge_type,
2295
2295
                                    show_base=show_base,
2296
2296
                                    reprocess=reprocess)
2297
2297
        finally: