/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/merge.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/merge.py
1230
1230
        if name_winner == "this" and parent_id_winner == "this":
1231
1231
            return
1232
1232
        if name_winner == 'conflict' or parent_id_winner == 'conflict':
1233
 
            # Creating helpers here cause problems down the road if a
1234
 
            # ContentConflict needs to be created so we should not do that
 
1233
            # Creating helpers (.OTHER or .THIS) here cause problems down the
 
1234
            # road if a ContentConflict needs to be created so we should not do
 
1235
            # that
1235
1236
            trans_id = self.tt.trans_id_file_id(file_id)
1236
1237
            self._raw_conflicts.append(('path conflict', trans_id, file_id,
1237
1238
                                        this_parent, this_name,
1575
1576
                c = _mod_conflicts.Conflict.factory(conflict_type,
1576
1577
                                                    path=path, file_id=file_id)
1577
1578
            else:
1578
 
                raise AssertionError()
 
1579
                raise AssertionError('bad conflict type: %r' % (conflict,))
1579
1580
            self.cooked_conflicts.append(c)
1580
 
 
1581
1581
        self.cooked_conflicts.sort(key=_mod_conflicts.Conflict.sort_key)
1582
1582
 
1583
1583