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

  • Committer: Vincent Ladeuil
  • Date: 2010-03-25 13:33:41 UTC
  • mfrom: (4597.9.4 cleanup)
  • mto: This revision was merged to the branch mainline in revision 5135.
  • Revision ID: v.ladeuil+lp@free.fr-20100325133341-ei22y1t401rs7nj5
Merge cleanup into more-tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
490
490
                # iterate. Taking the last parent is the safer bet in the mean
491
491
                # time. -- vila 20100309
492
492
                revid = tt._tree.get_parent_ids()[-1]
 
493
        else:
 
494
            # Programmer error
 
495
            raise AssertionError('bad winner: %r' % (winner,))
493
496
        if path_to_create is not None:
494
497
            tid = tt.trans_id_tree_path(path_to_create)
495
498
            transform.create_from_tree(