← Back to branch summary

~allanlesage/helipad/helipad-coverage

« back to all changes in this revision

Viewing changes to gaps/migrations/0001_initial.py

  • Committer: chris.gagnon
  • Date: 2014-02-20 23:47:48 UTC
  • mfrom: (733.1.2 coverage)
  • Revision ID: chris.gagnon@canonical.com-20140220234748-owhadyn8ivg9r9m1
fix conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
gaps/migrations/0001_initial.py
1
1
# -*- coding: utf-8 -*-
2
 
import datetime
 
2
from south.utils import datetime_utils as datetime
3
3
from south.db import db
4
4
from south.v2 import SchemaMigration
5
5
from django.db import models
32
32
 
33
33
        # Adding model 'CoverageData'
34
34
        db.create_table('gaps_coveragedata', (
 
35
<<<<<<< TREE
35
36
            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
36
37
            ('url', self.gf('django.db.models.fields.CharField')(max_length=4096)),
37
38
            ('name', self.gf('django.db.models.fields.CharField')(max_length=4096)),
 
39
=======
 
40
            ('artifact_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['common.Artifact'], unique=True, primary_key=True)),
 
41
>>>>>>> MERGE-SOURCE
38
42
            ('xml_file', self.gf('django.db.models.fields.TextField')()),
39
43
            ('line_coverage', self.gf('django.db.models.fields.IntegerField')()),
40
44
            ('branch_coverage', self.gf('django.db.models.fields.IntegerField')()),
106
110
            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['gaps.CoverageProject']"})
107
111
        },
108
112
        'gaps.coveragedata': {
 
113
<<<<<<< TREE
109
114
            'Meta': {'object_name': 'CoverageData'},
 
115
=======
 
116
            'Meta': {'object_name': 'CoverageData', '_ormbases': ['common.Artifact']},
 
117
            'artifact_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['common.Artifact']", 'unique': 'True', 'primary_key': 'True'}),
 
118
>>>>>>> MERGE-SOURCE
110
119
            'branch_coverage': ('django.db.models.fields.IntegerField', [], {}),
111
120
            'coverage_build': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['gaps.CoverageBuild']"}),
112
121
            'hit_count': ('django.db.models.fields.IntegerField', [], {}),