/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

  • Committer: John Arbash Meinel
  • Date: 2006-08-30 13:40:47 UTC
  • mfrom: (1973 +trunk)
  • mto: (1955.2.7 locale-35392)
  • mto: This revision was merged to the branch mainline in revision 1974.
  • Revision ID: john@arbash-meinel.com-20060830134047-ab74b254ec5ca502
[merge] bzr.dev 1973

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2248
2248
        tree, file_list = tree_files(file_list)
2249
2249
        tree.lock_write()
2250
2250
        try:
2251
 
            pending_merges = tree.pending_merges() 
2252
 
            if len(pending_merges) != 1:
 
2251
            parents = tree.get_parent_ids()
 
2252
            if len(parents) != 2:
2253
2253
                raise BzrCommandError("Sorry, remerge only works after normal"
2254
2254
                                      " merges.  Not cherrypicking or"
2255
2255
                                      " multi-merges.")
2256
2256
            repository = tree.branch.repository
2257
 
            base_revision = common_ancestor(tree.branch.last_revision(), 
2258
 
                                            pending_merges[0], repository)
 
2257
            base_revision = common_ancestor(parents[0],
 
2258
                                            parents[1], repository)
2259
2259
            base_tree = repository.revision_tree(base_revision)
2260
 
            other_tree = repository.revision_tree(pending_merges[0])
 
2260
            other_tree = repository.revision_tree(parents[1])
2261
2261
            interesting_ids = None
2262
2262
            new_conflicts = []
2263
2263
            conflicts = tree.conflicts()
2287
2287
                    pass
2288
2288
            conflicts = merge_inner(tree.branch, other_tree, base_tree,
2289
2289
                                    this_tree=tree,
2290
 
                                    interesting_ids=interesting_ids, 
2291
 
                                    other_rev_id=pending_merges[0], 
2292
 
                                    merge_type=merge_type, 
 
2290
                                    interesting_ids=interesting_ids,
 
2291
                                    other_rev_id=parents[1],
 
2292
                                    merge_type=merge_type,
2293
2293
                                    show_base=show_base,
2294
2294
                                    reprocess=reprocess)
2295
2295
        finally: